diff --git a/engine/src/flutter/ci/bin/format.dart b/engine/src/flutter/ci/bin/format.dart index 700995ea552..608ef4b28be 100644 --- a/engine/src/flutter/ci/bin/format.dart +++ b/engine/src/flutter/ci/bin/format.dart @@ -804,7 +804,7 @@ Future _getDiffBaseRevision(ProcessManager processManager, Directory rep if (upstreamUrl.isEmpty) { upstream = 'origin'; } - await _runGit(['fetch', upstream, 'master'], processRunner); + await _runGit(['fetch', upstream, 'main'], processRunner); String result = ''; try { // This is the preferred command to use, but developer checkouts often do diff --git a/engine/src/flutter/tools/clang_tidy/lib/src/git_repo.dart b/engine/src/flutter/tools/clang_tidy/lib/src/git_repo.dart index 39621ab4fc7..8367b736b33 100644 --- a/engine/src/flutter/tools/clang_tidy/lib/src/git_repo.dart +++ b/engine/src/flutter/tools/clang_tidy/lib/src/git_repo.dart @@ -18,7 +18,7 @@ class GitRepo { List? _changedFiles; /// Returns a list of all non-deleted files which differ from the nearest - /// merge-base with `master`. If it can't find a fork point, uses the default + /// merge-base with `main`. If it can't find a fork point, uses the default /// merge-base. /// /// This is only computed once and cached. Subsequent invocations of the @@ -31,7 +31,7 @@ class GitRepo { defaultWorkingDirectory: root, ); final ProcessRunnerResult fetchResult = await processRunner.runProcess( - ['git', 'fetch', 'upstream', 'master'], + ['git', 'fetch', 'upstream', 'main'], failOk: true, ); if (fetchResult.exitCode != 0) { @@ -39,7 +39,7 @@ class GitRepo { 'git', 'fetch', 'origin', - 'master', + 'main', ]); } final Set result = {}; diff --git a/engine/src/flutter/tools/gen_objcdoc.sh b/engine/src/flutter/tools/gen_objcdoc.sh index cfef2b5265a..928acfa8d21 100755 --- a/engine/src/flutter/tools/gen_objcdoc.sh +++ b/engine/src/flutter/tools/gen_objcdoc.sh @@ -46,7 +46,7 @@ jazzy \ --author Flutter Team\ --author_url 'https://flutter.io'\ --github_url 'https://github.com/flutter'\ - --github-file-prefix 'http://github.com/flutter/engine/blob/master'\ + --github-file-prefix 'http://github.com/flutter/engine/blob/main'\ --module-version 1.0.0\ --xcodebuild-arguments --objc,"$FLUTTER_UMBRELLA_HEADER",--,-x,objective-c,-isysroot,"$(xcrun --show-sdk-path --sdk iphonesimulator)",-I,"$(pwd)"\ --module Flutter\