Skip to content

Commit 780fbeb

Browse files
committed
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 <[email protected]>
1 parent 4d7268b commit 780fbeb

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

t/t4200-rerere.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,8 @@ merge_conflict_resolve () {
446446
}
447447

448448
test_expect_success 'multiple identical conflicts' '
449+
rm -fr .git/rr-cache &&
450+
mkdir .git/rr-cache &&
449451
git reset --hard &&
450452
451453
test_seq 1 6 >early &&

0 commit comments

Comments
 (0)