diff options
| author | Richard Hansen <hansenr@google.com> | 2017-01-10 15:41:56 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 13:22:20 -0800 |
| commit | e866ff851a9cfed8a3ef24dc98e5cd6177ae0618 (patch) | |
| tree | f5ee9783b2760fcb075dda0eecb18c5cda9bf10e /t/t7610-mergetool.sh | |
| parent | c3ad3126b8113e9ed90ec8639a2ef266e9190565 (diff) | |
| download | git-e866ff851a9cfed8a3ef24dc98e5cd6177ae0618.tar.gz | |
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>
Diffstat (limited to 't/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index df6b4c579c..28b5f847a5 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 && |