diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 13:49:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 14:51:01 -0700 |
| commit | 780fbeba63e792199a0974826a5ef0267af83c1a (patch) | |
| tree | 0a5211e3f5f3ab8ad93f7c4ac8e2026bb2c20f69 | |
| parent | 4d7268b888d7bb6d675340ec676e4239739d0f6d (diff) | |
| download | git-780fbeba63e792199a0974826a5ef0267af83c1a.tar.gz | |
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>
| -rwxr-xr-x | t/t4200-rerere.sh | 2 |
1 files changed, 2 insertions, 0 deletions
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 && |