Skip to content

[tool] Remove use of FETCH_HEAD #10357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 4 commits into from
Nov 4, 2025
Merged

[tool] Remove use of FETCH_HEAD #10357

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a82255
[tool] Remove use of FETCH_HEAD
stuartmorgan-g Nov 3, 2025
8048f2f
Re-add fetch of main
stuartmorgan-g Nov 4, 2025
fd930ec
Create main
stuartmorgan-g Nov 4, 2025
f35efe0
Merge branch 'main' into tool-remove-fetch-head
stuartmorgan-g Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .ci/scripts/prepare_tool.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@
# found in the LICENSE file.
set -e

# To set FETCH_HEAD for "git merge-base" to work
git fetch origin main

cd script/tool
dart pub get
2 changes: 1 addition & 1 deletion script/tool/lib/src/common/git_version_finder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down
2 changes: 1 addition & 1 deletion script/tool/lib/src/common/package_command.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ abstract class PackageCommand extends Command<void> {
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, '
Expand Down
2 changes: 1 addition & 1 deletion script/tool/test/common/git_version_finder_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ file2/file2.cc
final GitVersionFinder finder = GitVersionFinder(gitDir);
await finder.getChangedFiles();
verify(gitDir.runCommand(
<String>['merge-base', '--fork-point', 'FETCH_HEAD', 'HEAD'],
<String>['merge-base', '--fork-point', 'main', 'HEAD'],
throwOnError: false));
verify(gitDir.runCommand(
<String>['diff', '--name-only', mergeBaseResponse, 'HEAD']));
Expand Down
2 changes: 1 addition & 1 deletion script/tool/test/version_check_command_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void main() {
gitProcessRunner.recordedCalls,
containsAllInOrder(const <ProcessCall>[
ProcessCall('git-merge-base',
<String>['--fork-point', 'FETCH_HEAD', 'HEAD'], null),
<String>['--fork-point', 'main', 'HEAD'], null),
ProcessCall('git-show',
<String>['abc123:packages/plugin/pubspec.yaml'], null),
]));
Expand Down