aboutsummaryrefslogtreecommitdiff
path: root/git-codereview/sync_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'git-codereview/sync_test.go')
-rw-r--r--git-codereview/sync_test.go6
1 files changed, 3 insertions, 3 deletions
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)