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>
Junio C Hamano committed
Aug 22, 2017 at 13:49 UTC
780fbeba63e792199a0974826a5ef0267af83c1a
1 file changed
+2
t/t4200-rerere.sh
+2
@@ -446,6 +446,8 @@ merge_conflict_resolve () {
446
}
447
448
test_expect_success 'multiple identical conflicts' '
449
+ rm -fr .git/rr-cache &&
450
+ mkdir .git/rr-cache &&
451
git reset --hard &&
452
453
test_seq 1 6 >early &&