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>
This commit is contained in:
Junio C Hamano 2017-08-22 13:49:02 -07:00
Родитель 4d7268b888
Коммит 780fbeba63
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -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 &&