Merge branch 'sg/tests-prereq'

[thirdparty/git.git] / t / t6437-submodule-merge.sh

diff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh
index 6a1e5f82324877a774fba03e5657654510de994f..3ead2b726f4b3fac9060c53721471858d59c1e4a 100755 (executable)
--- a/t/t6437-submodule-merge.sh
+++ b/t/t6437-submodule-merge.sh
@@ -127,7 +127,12 @@ test_expect_success 'merging should conflict for non fast-forward' '
         git checkout -b test-nonforward b &&
         (cd sub &&
          git rev-parse sub-d > ../expect) &&
-        test_must_fail git merge c 2> actual  &&
+         if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+         then
+               test_must_fail git merge c >actual
+         else
+               test_must_fail git merge c 2> actual
+         fi &&
         grep $(cat expect) actual > /dev/null &&
         git reset --hard)
 '
@@ -138,9 +143,21 @@ test_expect_success 'merging should fail for ambiguous common parent' '
        (cd sub &&
         git checkout -b ambiguous sub-b &&
         git merge sub-c &&
-        git rev-parse sub-d > ../expect1 &&
-        git rev-parse ambiguous > ../expect2) &&
-       test_must_fail git merge c 2> actual &&
+        if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+        then
+               git rev-parse --short sub-d >../expect1 &&
+               git rev-parse --short ambiguous >../expect2
+        else
+               git rev-parse sub-d > ../expect1 &&
+               git rev-parse ambiguous > ../expect2
+        fi
+        ) &&
+        if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+        then
+               test_must_fail git merge c >actual
+        else
+               test_must_fail git merge c 2> actual
+        fi &&
        grep $(cat expect1) actual > /dev/null &&
        grep $(cat expect2) actual > /dev/null &&
        git reset --hard)