diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6028-merge-up-to-date.sh | 2 | ||||
| -rwxr-xr-x | t/t7602-merge-octopus-many.sh | 2 | ||||
| -rwxr-xr-x | t/t7603-merge-reduce-heads.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/t/t6028-merge-up-to-date.sh b/t/t6028-merge-up-to-date.sh index 824fca5b5b..c518e9c30c 100755 --- a/t/t6028-merge-up-to-date.sh +++ b/t/t6028-merge-up-to-date.sh @@ -79,7 +79,7 @@ test_expect_success 'merge -s subtree up-to-date' ' ' -test_expect_failure 'merge fast-forward octopus' ' +test_expect_success 'merge fast-forward octopus' ' git reset --hard c0 && test_tick && diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh index 83e917b918..7117b57ccc 100755 --- a/t/t7602-merge-octopus-many.sh +++ b/t/t7602-merge-octopus-many.sh @@ -76,7 +76,7 @@ Merge made by the 'recursive' strategy. create mode 100644 c5.c EOF -test_expect_failure 'merge reduces irrelevant remote heads' ' +test_expect_success 'merge reduces irrelevant remote heads' ' GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual && test_cmp expected actual ' diff --git a/t/t7603-merge-reduce-heads.sh b/t/t7603-merge-reduce-heads.sh index f2934e8c25..a3b08a6420 100755 --- a/t/t7603-merge-reduce-heads.sh +++ b/t/t7603-merge-reduce-heads.sh @@ -119,7 +119,7 @@ test_expect_success 'fast-forward to redundant refs' ' git merge c4 c5 ' -test_expect_failure 'verify merge result' ' +test_expect_success 'verify merge result' ' test $(git rev-parse HEAD) = $(git rev-parse c5) ' |