diff options
| -rw-r--r-- | git-codereview/sync.go | 10 | ||||
| -rw-r--r-- | git-codereview/sync_test.go | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/git-codereview/sync.go b/git-codereview/sync.go index 2d93bcb..f8233f1 100644 --- a/git-codereview/sync.go +++ b/git-codereview/sync.go @@ -56,10 +56,16 @@ func cmdSync(args []string) { // We want to pull in the remote changes from the upstream branch // and rebase the current pending commit (if any) on top of them. // If there is no pending commit, the pull will do a fast-forward merge. + // + // The -c advice.skippedCherryPicks=false disables this message: + // + // hint: use --reapply-cherry-picks to include skipped commits + // hint: Disable this message with "git config advice.skippedCherryPicks false" + // if *verbose > 1 { - run("git", "pull", "-q", "-r", "-v", "origin", strings.TrimPrefix(b.OriginBranch(), "origin/")) + run("git", "-c", "advice.skippedCherryPicks=false", "pull", "-q", "-r", "-v", "origin", strings.TrimPrefix(b.OriginBranch(), "origin/")) } else { - run("git", "pull", "-q", "-r", "origin", strings.TrimPrefix(b.OriginBranch(), "origin/")) + run("git", "-c", "advice.skippedCherryPicks=false", "pull", "-q", "-r", "origin", strings.TrimPrefix(b.OriginBranch(), "origin/")) } b = CurrentBranch() // discard any cached information diff --git a/git-codereview/sync_test.go b/git-codereview/sync_test.go index 31f4800..884168c 100644 --- a/git-codereview/sync_test.go +++ b/git-codereview/sync_test.go @@ -118,15 +118,15 @@ func TestSyncRebase(t *testing.T) { // also exercising -v parsing. testMain(t, "sync", "-v=true") testNoStdout(t) - testPrintedStderr(t, "git pull -q -r origin main") + testPrintedStderr(t, "git -c advice.skippedCherryPicks=false pull -q -r origin main") testMain(t, "sync", "-v=1") testNoStdout(t) - testPrintedStderr(t, "git pull -q -r origin main") + testPrintedStderr(t, "git -c advice.skippedCherryPicks=false pull -q -r origin main") testMain(t, "sync", "-v") testNoStdout(t) - testPrintedStderr(t, "git pull -q -r origin main") + testPrintedStderr(t, "git -c advice.skippedCherryPicks=false pull -q -r origin main") testMain(t, "sync", "-v=false") testNoStdout(t) |