t6423: expect improved conflict markers labels in the ort backend

Conflict markers carry an extra annotation of the form
   REF-OR-COMMIT:FILENAME
to help distinguish where the content is coming from, with the :FILENAME
piece being left off if it is the same for both sides of history (thus
only renames with content conflicts carry that part of the annotation).
However, there were cases where the :FILENAME annotation was
accidentally left off, due to merge-recursive's
every-codepath-needs-a-copy-of-all-special-case-code format.

Update a few tests to have the correct :FILENAME extension on relevant
paths with the ort backend, while leaving the expectation for
merge-recursive the same to avoid destabilizing it.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh
index f9a3f24039ec7c7d19e90f75143c8db3dd33cb2e..7e32626913afde000f19f943bc9fee41dfceda5e 100755 (executable)
--- a/t/t6423-merge-rename-directories.sh
+++ b/t/t6423-merge-rename-directories.sh
@@ -302,11 +302,20 @@ test_expect_success '1d: Directory renames cause a rename/rename(2to1) conflict'
                git cat-file -p :2:x/wham >expect &&
                git cat-file -p :3:x/wham >other &&
                >empty &&
-               test_must_fail git merge-file \
-                       -L "HEAD" \
-                       -L "" \
-                       -L "B^0" \
-                       expect empty other &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       test_must_fail git merge-file \
+                               -L "HEAD:y/wham" \
+                               -L "" \
+                               -L "B^0:z/wham" \
+                               expect empty other
+               else
+                       test_must_fail git merge-file \
+                               -L "HEAD" \
+                               -L "" \
+                               -L "B^0" \
+                               expect empty other
+               fi &&
                test_cmp expect x/wham
        )
 '
@@ -1823,11 +1832,20 @@ test_expect_success '7b: rename/rename(2to1), but only due to transitive rename'
                git cat-file -p :2:y/d >expect &&
                git cat-file -p :3:y/d >other &&
                >empty &&
-               test_must_fail git merge-file \
-                       -L "HEAD" \
-                       -L "" \
-                       -L "B^0" \
-                       expect empty other &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       test_must_fail git merge-file \
+                               -L "HEAD:y/d" \
+                               -L "" \
+                               -L "B^0:z/d" \
+                               expect empty other
+               else
+                       test_must_fail git merge-file \
+                               -L "HEAD" \
+                               -L "" \
+                               -L "B^0" \
+                               expect empty other
+               fi &&
                test_cmp expect y/d
        )
 '