diff options
| author | Romaric Jodin <rjodin@google.com> | 2026-10-29 08:52:04 +0100 |
|---|---|---|
| committer | gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2026-11-03 00:10:19 -0800 |
| commit | 365629015667e04739f59070e745548a728549c8 (patch) | |
| tree | dc4fee64bdec9157fe232c5689a3763fbcb70057 /subcmds/diffmanifests.py | |
| parent | b90c7cd8f9e14418c4a486f424fc9afc84d3ff18 (diff) | |
| download | git-repo-2.72.tar.gz | |
When uploading a branch that merges another remote-tracking branch (such
as an upstream branch into the destination branch), ReviewableBranch
only excludes the destination tracking branch (^base). As a result, git
rev-list walks the merged parent and counts all merged commits even
though they already exist on a remote branch, triggering the unusual
commit count warning in _VerifyPendingCommits.
Add --ignore-remote-commits to `repo upload` to pass --not --remotes to
git rev-list in ReviewableBranch so commits already reachable from
refs/remotes/* are excluded from the pending commit list.
Test: ./run_tests tests/test_project.py tests/test_subcmds_upload.py
Change-Id: Ib1fb864982729e20a621144580fe95daa478eaee
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/651284
Tested-by: Romaric Jodin <rjodin@google.com>
Reviewed-by: Brian Gan <brgan@google.com>
Commit-Queue: Romaric Jodin <rjodin@google.com>
Diffstat (limited to 'subcmds/diffmanifests.py')
0 files changed, 0 insertions, 0 deletions
