summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorRomaric Jodin <rjodin@google.com>2026-10-29 08:52:04 +0100
committergerrit-scoped@luci-project-accounts.iam.gserviceaccount.com <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>2026-11-03 00:10:19 -0800
commit365629015667e04739f59070e745548a728549c8 (patch)
treedc4fee64bdec9157fe232c5689a3763fbcb70057 /man
parentb90c7cd8f9e14418c4a486f424fc9afc84d3ff18 (diff)
downloadgit-repo-2.72.tar.gz
upload: add --ignore-remote-commitsv2.72stable
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 'man')
-rw-r--r--man/repo-upload.15
1 files changed, 4 insertions, 1 deletions
diff --git a/man/repo-upload.1 b/man/repo-upload.1
index ad17b6987..3d7abb91e 100644
--- a/man/repo-upload.1
+++ b/man/repo-upload.1
@@ -1,5 +1,5 @@
1.\" DO NOT MODIFY THIS FILE! It was generated by help2man. 1.\" DO NOT MODIFY THIS FILE! It was generated by help2man.
2.TH REPO "1" "August 2026" "repo upload" "Repo Manual" 2.TH REPO "1" "October 2026" "repo upload" "Repo Manual"
3.SH NAME 3.SH NAME
4repo \- repo upload - manual page for repo upload 4repo \- repo upload - manual page for repo upload
5.SH SYNOPSIS 5.SH SYNOPSIS
@@ -80,6 +80,9 @@ ignore untracked files in the working copy
80\fB\-\-no\-ignore\-untracked\-files\fR 80\fB\-\-no\-ignore\-untracked\-files\fR
81always ask about untracked files in the working copy 81always ask about untracked files in the working copy
82.TP 82.TP
83\fB\-\-ignore\-remote\-commits\fR
84ignore commits already in remote branches
85.TP
83\fB\-\-no\-cert\-checks\fR 86\fB\-\-no\-cert\-checks\fR
84disable verifying ssl certs (unsafe) 87disable verifying ssl certs (unsafe)
85.SS Logging options: 88.SS Logging options: