From b04b288d5464253e76c11b8926cdb6721c25a073 Mon Sep 17 00:00:00 2001
From: siddharth <s@ricketyspace.net>
Date: Thu, 6 Jan 2022 21:15:14 -0500
Subject: review: fix TestSyncRebase test

Disable `advice.skippedCherryPicks` on the test client git repo to
suppress git's --reapply-cherry-picks hint when commits with same
content but different commit hashes are skipped on rebase.

Fixes golang/go#50453

Change-Id: I6d3a9cebf50f55c96d2ad096a58222c7988bcc61
Reviewed-on: https://go-review.googlesource.com/c/review/+/376039
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>
Trust: Heschi Kreinick <heschi@google.com>
Trust: Dmitri Shuralyov <dmitshur@golang.org>
---
 git-codereview/sync_test.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/git-codereview/sync_test.go b/git-codereview/sync_test.go
index 6470c5e..31f4800 100644
--- a/git-codereview/sync_test.go
+++ b/git-codereview/sync_test.go
@@ -55,6 +55,9 @@ func TestSyncRebase(t *testing.T) {
 	gt := newGitTest(t)
 	defer gt.done()
 
+	// Suppress --reapply-cherry-picks hint.
+	trun(t, gt.client, "git", "config", "advice.skippedCherryPicks", "false")
+
 	// client 3 ahead
 	gt.work(t)
 	gt.work(t)
-- 
cgit v1.3