From: Junio C Hamano Date: Tue, 22 Aug 2017 21:46:47 GMT Subject: [PATCH v2 1/6] t4200: give us a clean slate after "rerere gc" tests Message-ID: <20170822214652.31626-2-gitster@pobox.com> In-Reply-To: <20170822214652.31626-1-gitster@pobox.com> 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 --- t/t4200-rerere.sh | 2 ++ 1 file changed, 2 insertions(+) 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 && -- 2.14.1-427-g5711bb0564