]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4d7268b) | patch
t4200: give us a clean slate after "rerere gc" tests
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Aug 2017 20:49:02 +0000 (13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Aug 2017 21:51:01 +0000 (14:51 -0700)
commit780fbeba63e792199a0974826a5ef0267af83c1a
tree0a5211e3f5f3ab8ad93f7c4ac8e2026bb2c20f69tree | snapshot
parent4d7268b888d7bb6d675340ec676e4239739d0f6dcommit | diff
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>
t/t4200-rerere.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.