diff --git a/.ci/scripts/prepare_tool.sh b/.ci/scripts/prepare_tool.sh index 17f993454e2..33646d56e7c 100755 --- a/.ci/scripts/prepare_tool.sh +++ b/.ci/scripts/prepare_tool.sh @@ -4,8 +4,9 @@ # found in the LICENSE file. set -e -# To set FETCH_HEAD for "git merge-base" to work +# Ensure that 'main' is present for diffing. git fetch origin main +git branch main origin/main cd script/tool dart pub get diff --git a/script/tool/lib/src/common/git_version_finder.dart b/script/tool/lib/src/common/git_version_finder.dart index fd79abdc114..fef25af26a5 100644 --- a/script/tool/lib/src/common/git_version_finder.dart +++ b/script/tool/lib/src/common/git_version_finder.dart @@ -15,7 +15,7 @@ class GitVersionFinder { : assert(baseSha == null || baseBranch == null, 'At most one of baseSha and baseBranch can be provided'), _baseSha = baseSha, - _baseBranch = baseBranch ?? 'FETCH_HEAD'; + _baseBranch = baseBranch ?? 'main'; /// The top level directory of the git repo. /// diff --git a/script/tool/lib/src/common/package_command.dart b/script/tool/lib/src/common/package_command.dart index 6b269a279a0..d48e4a539fb 100644 --- a/script/tool/lib/src/common/package_command.dart +++ b/script/tool/lib/src/common/package_command.dart @@ -129,7 +129,7 @@ abstract class PackageCommand extends Command { argParser.addOption(_baseBranchArg, help: 'The base branch whose merge base is used as the base SHA if ' '--$_baseShaArg is not provided. \n' - 'If not specified, FETCH_HEAD is used as the base branch.'); + 'If not specified, "main" is used as the base branch.'); argParser.addFlag(_logTimingArg, help: 'Logs timing information.\n\n' 'Currently only logs per-package timing for multi-package commands, ' diff --git a/script/tool/test/common/git_version_finder_test.dart b/script/tool/test/common/git_version_finder_test.dart index b228330c291..34912820438 100644 --- a/script/tool/test/common/git_version_finder_test.dart +++ b/script/tool/test/common/git_version_finder_test.dart @@ -66,7 +66,7 @@ file2/file2.cc final GitVersionFinder finder = GitVersionFinder(gitDir); await finder.getChangedFiles(); verify(gitDir.runCommand( - ['merge-base', '--fork-point', 'FETCH_HEAD', 'HEAD'], + ['merge-base', '--fork-point', 'main', 'HEAD'], throwOnError: false)); verify(gitDir.runCommand( ['diff', '--name-only', mergeBaseResponse, 'HEAD'])); diff --git a/script/tool/test/version_check_command_test.dart b/script/tool/test/version_check_command_test.dart index 4c852bb110d..d23b7535fda 100644 --- a/script/tool/test/version_check_command_test.dart +++ b/script/tool/test/version_check_command_test.dart @@ -150,7 +150,7 @@ void main() { gitProcessRunner.recordedCalls, containsAllInOrder(const [ ProcessCall('git-merge-base', - ['--fork-point', 'FETCH_HEAD', 'HEAD'], null), + ['--fork-point', 'main', 'HEAD'], null), ProcessCall('git-show', ['abc123:packages/plugin/pubspec.yaml'], null), ]));