mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7610: delete some now-unnecessary 'git reset --hard' lines

Browse Source 
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>
This commit is contained in:
Richard Hansen
2017-01-10 15:41:56 -05:00
committed by Junio C Hamano
parent c3ad3126b8
commit e866ff851a
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t7610-mergetool.sh
View File

@ -184,7 +184,6 @@ test_expect_success 'mergetool in subdir' '
test_expect_success 'mergetool on file in parent dir' ' test_expect_success 'mergetool on file in parent dir' '
test_when_finished "git reset --hard" && test_when_finished "git reset --hard" &&
git reset --hard &&
git submodule update -N && git submodule update -N &&
( (
cd subdir && cd subdir &&
@ -277,7 +276,6 @@ test_expect_success 'conflicted stash sets up rerere' '
test_expect_success 'mergetool takes partial path' ' test_expect_success 'mergetool takes partial path' '
test_when_finished "git reset --hard" && test_when_finished "git reset --hard" &&
git reset --hard &&
test_config rerere.enabled false && test_config rerere.enabled false &&
git checkout -b test$test_count branch1 && git checkout -b test$test_count branch1 &&
git submodule update -N && git submodule update -N &&