t7610: delete some now-unnecessary 'git reset --hard' lines
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@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Richard Hansen committed
Jan 10, 2017 at 15:41 UTC
e866ff851a9cfed8a3ef24dc98e5cd6177ae0618
1 file changed
-2
t/t7610-mergetool.sh
-2
@@ -184,7 +184,6 @@ test_expect_success 'mergetool in subdir' '
184
185
test_expect_success 'mergetool on file in parent dir' '
186
test_when_finished "git reset --hard" &&
187
- git reset --hard &&
187
git submodule update -N &&
188
(
189
cd subdir &&
@@ -277,7 +276,6 @@ test_expect_success 'conflicted stash sets up rerere' '
276
277
test_expect_success 'mergetool takes partial path' '
278
test_when_finished "git reset --hard" &&
280
- git reset --hard &&
279
test_config rerere.enabled false &&
280
git checkout -b test$test_count branch1 &&
281
git submodule update -N &&