diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1015-read-index-unmerged.sh | 8 | ||||
| -rwxr-xr-x | t/t6020-merge-df.sh | 3 | ||||
| -rwxr-xr-x | t/t6042-merge-rename-corner-cases.sh | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/t/t1015-read-index-unmerged.sh b/t/t1015-read-index-unmerged.sh index 32ef6bdcfa..55d22da32c 100755 --- a/t/t1015-read-index-unmerged.sh +++ b/t/t1015-read-index-unmerged.sh @@ -30,7 +30,7 @@ test_expect_success 'setup modify/delete + directory/file conflict' ' ) ' -test_expect_failure 'read-tree --reset cleans unmerged entries' ' +test_expect_success 'read-tree --reset cleans unmerged entries' ' test_when_finished "git -C df_plus_modify_delete clean -f" && test_when_finished "git -C df_plus_modify_delete reset --hard" && ( @@ -45,7 +45,7 @@ test_expect_failure 'read-tree --reset cleans unmerged entries' ' ) ' -test_expect_failure 'One reset --hard cleans unmerged entries' ' +test_expect_success 'One reset --hard cleans unmerged entries' ' test_when_finished "git -C df_plus_modify_delete clean -f" && test_when_finished "git -C df_plus_modify_delete reset --hard" && ( @@ -87,7 +87,7 @@ test_expect_success 'setup directory/file conflict + simple edit/edit' ' ) ' -test_expect_failure 'git merge --abort succeeds despite D/F conflict' ' +test_expect_success 'git merge --abort succeeds despite D/F conflict' ' test_when_finished "git -C df_plus_edit_edit clean -f" && test_when_finished "git -C df_plus_edit_edit reset --hard" && ( @@ -103,7 +103,7 @@ test_expect_failure 'git merge --abort succeeds despite D/F conflict' ' ) ' -test_expect_failure 'git am --skip succeeds despite D/F conflict' ' +test_expect_success 'git am --skip succeeds despite D/F conflict' ' test_when_finished "git -C df_plus_edit_edit clean -f" && test_when_finished "git -C df_plus_edit_edit reset --hard" && ( diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh index 2af1beec5f..46b506b3b7 100755 --- a/t/t6020-merge-df.sh +++ b/t/t6020-merge-df.sh @@ -89,9 +89,6 @@ test_expect_success 'modify/delete + directory/file conflict' ' ' test_expect_success 'modify/delete + directory/file conflict; other way' ' - # Yes, we really need the double reset since "letters" appears as - # both a file and a directory. - git reset --hard && git reset --hard && git clean -f && git checkout modify^0 && diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh index 411550d2b6..de77bfaf4f 100755 --- a/t/t6042-merge-rename-corner-cases.sh +++ b/t/t6042-merge-rename-corner-cases.sh @@ -236,7 +236,6 @@ test_expect_success 'setup content merge + rename/directory conflict' ' test_expect_success 'rename/directory conflict + clean content merge' ' git reset --hard && - git reset --hard && git clean -fdqx && git checkout left-clean^0 && @@ -260,7 +259,6 @@ test_expect_success 'rename/directory conflict + clean content merge' ' test_expect_success 'rename/directory conflict + content merge conflict' ' git reset --hard && - git reset --hard && git clean -fdqx && git checkout left-conflict^0 && |