Tests now always run 'git reset --hard' at the end (even if they fail), so it's no longer necessary to run 'git reset --hard' at the beginning of a test. Signed-off-by: Richard Hansen <hansenr@xxxxxxxxxx> --- t/t7610-mergetool.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 55587504e..7d5e1df88 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -184,7 +184,6 @@ 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 && ( cd subdir && @@ -277,7 +276,6 @@ test_expect_success 'conflicted stash sets up rerere' ' test_expect_success 'mergetool takes partial path' ' test_when_finished "git reset --hard" && - git reset --hard && test_config rerere.enabled false && git checkout -b test$test_count branch1 && git submodule update -N && -- 2.11.0.390.gc69c2f50cf-goog