зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
c3ad3126b8
Коммит
e866ff851a
|
@ -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 &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче