From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Aug 2017 20:49:02 +0000 (-0700)
Subject: t4200: give us a clean slate after "rerere gc" tests
X-Git-Tag: v2.15.0-rc0~118^2~5
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=780fbeba63e792199a0974826a5ef0267af83c1a;p=git.git

t4200: give us a clean slate after "rerere gc" tests

The "multiple identical conflicts" test counts the number of entries
in the rerere database after trying a handful of mergy operations
and recording their resolutions, but without initializing the rerere
database to a known state, allowing the state left by previous tests
to trigger a false failure.  Make it robust by cleaning the database
before it starts.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 1a080e7823..8f5f268baf 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -446,6 +446,8 @@ merge_conflict_resolve () {
 }
 
 test_expect_success 'multiple identical conflicts' '
+	rm -fr .git/rr-cache &&
+	mkdir .git/rr-cache &&
 	git reset --hard &&
 
 	test_seq 1 6 >early &&