diff options
| author | Richard Hansen <hansenr@google.com> | 2017-01-10 20:41:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 21:22:20 (GMT) |
| commit | c3ad3126b8113e9ed90ec8639a2ef266e9190565 (patch) | |
| tree | ba5de923744a74b7f96e25d6e281c53e0b57c20f /t | |
| parent | b696ac9aafd57fad68383b4edd31784462d34bcb (diff) | |
| download | git-c3ad3126b8113e9ed90ec8639a2ef266e9190565.zip git-c3ad3126b8113e9ed90ec8639a2ef266e9190565.tar.gz git-c3ad3126b8113e9ed90ec8639a2ef266e9190565.tar.bz2 | |
t7610: run 'git reset --hard' after each test to clean up
Use test_when_finished to run 'git reset --hard' after each test so
that the repository is left in a saner state for the next test.
This is a step toward making the tests more independent so that if one
test fails it doesn't cause subsequent tests to fail.
Signed-off-by: Richard Hansen <hansenr@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7610-mergetool.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 79545ec..df6b4c5 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -127,6 +127,7 @@ test_expect_success 'setup' ' ' test_expect_success 'custom mergetool' ' + test_when_finished "git reset --hard" && git checkout -b test$test_count branch1 && git submodule update -N && test_must_fail git merge master >/dev/null 2>&1 && @@ -170,6 +171,7 @@ test_expect_success 'mergetool crlf' ' ' test_expect_success 'mergetool in subdir' ' + test_when_finished "git reset --hard" && git checkout -b test$test_count branch1 && git submodule update -N && ( @@ -181,6 +183,7 @@ test_expect_success 'mergetool in subdir' ' ' test_expect_success 'mergetool on file in parent dir' ' + test_when_finished "git reset --hard" && git reset --hard && git submodule update -N && ( @@ -214,6 +217,7 @@ test_expect_success 'mergetool skips autoresolved' ' ' test_expect_success 'mergetool merges all from subdir' ' + test_when_finished "git reset --hard" && test_config rerere.enabled false && ( cd subdir && @@ -244,6 +248,7 @@ test_expect_success 'mergetool skips resolved paths when rerere is active' ' ' test_expect_success 'conflicted stash sets up rerere' ' + test_when_finished "git reset --hard" && test_config rerere.enabled true && git checkout stash1 && echo "Conflicting stash content" >file11 && @@ -403,6 +408,7 @@ test_expect_success 'deleted vs modified submodule' ' ' test_expect_success 'file vs modified submodule' ' + test_when_finished "git reset --hard" && git checkout -b test$test_count branch1 && git submodule update -N && mv submod submod-movedaside && @@ -474,6 +480,7 @@ test_expect_success 'file vs modified submodule' ' ' test_expect_success 'submodule in subdirectory' ' + test_when_finished "git reset --hard" && git checkout -b test$test_count branch1 && git submodule update -N && ( @@ -535,6 +542,7 @@ test_expect_success 'submodule in subdirectory' ' ' test_expect_success 'directory vs modified submodule' ' + test_when_finished "git reset --hard" && git checkout -b test$test_count branch1 && mv submod submod-movedaside && git rm --cached submod && |