merge tests: expect improved directory/file conflict handling in ort

merge-recursive.c is built on the idea of running unpack_trees() and
then "doing minor touch-ups" to get the result.  Unfortunately,
unpack_trees() was run in an update-as-it-goes mode, leading
merge-recursive.c to follow suit and end up with an immediate evaluation
and fix-it-up-as-you-go design.  Some things like directory/file
conflicts are not well representable in the index data structure, and
required special extra code to handle.  But then when it was discovered
that rename/delete conflicts could also be involved in directory/file
conflicts, the special directory/file conflict handling code had to be
copied to the rename/delete codepath.  ...and then it had to be copied
for modify/delete, and for rename/rename(1to2) conflicts, ...and yet it
still missed some.  Further, when it was discovered that there were also
file/submodule conflicts and submodule/directory conflicts, we needed to
copy the special submodule handling code to all the special cases
throughout the codebase.

And then it was discovered that our handling of directory/file conflicts
was suboptimal because it would create untracked files to store the
contents of the conflicting file, which would not be cleaned up if
someone were to run a 'git merge --abort' or 'git rebase --abort'.  It
was also difficult or scary to try to add or remove the index entries
corresponding to these files given the directory/file conflict in the
index.  But changing merge-recursive.c to handle these correctly was a
royal pain because there were so many sites in the code with similar but
not identical code for handling directory/file/submodule conflicts that
would all need to be updated.

I have worked hard to push all directory/file/submodule conflict
handling in merge-ort through a single codepath, and avoid creating
untracked files for storing tracked content (it does record things at
alternate paths, but makes sure they have higher-order stages in the
index).

Since updating merge-recursive is too much work and we don't want to
destabilize it, instead update the testsuite to have different
expectations for relevant directory/file/submodule conflict tests.

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

diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh
index f1b84617aff1b78e23b65a149e139cc3feea8577..9da08382164dd2c0fe9d9b8d84c6b8450d161917 100755 (executable)
--- a/t/t6400-merge-df.sh
+++ b/t/t6400-merge-df.sh
@@ -81,7 +81,12 @@ test_expect_success 'modify/delete + directory/file conflict' '
 
        test 5 -eq $(git ls-files -s | wc -l) &&
        test 4 -eq $(git ls-files -u | wc -l) &&
-       test 1 -eq $(git ls-files -o | wc -l) &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               test 0 -eq $(git ls-files -o | wc -l)
+       else
+               test 1 -eq $(git ls-files -o | wc -l)
+       fi &&
 
        test_path_is_file letters/file &&
        test_path_is_file letters.txt &&
@@ -97,7 +102,12 @@ test_expect_success 'modify/delete + directory/file conflict; other way' '
 
        test 5 -eq $(git ls-files -s | wc -l) &&
        test 4 -eq $(git ls-files -u | wc -l) &&
-       test 1 -eq $(git ls-files -o | wc -l) &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               test 0 -eq $(git ls-files -o | wc -l)
+       else
+               test 1 -eq $(git ls-files -o | wc -l)
+       fi &&
 
        test_path_is_file letters/file &&
        test_path_is_file letters.txt &&

diff --git a/t/t6402-merge-rename.sh b/t/t6402-merge-rename.sh
index bbbba3dcbf0de73a65f0c7258c6b5c5b3278e542..47d4434d64ee9fe9dc11e2d78b2ae8c7ec33f91c 100755 (executable)
--- a/t/t6402-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -397,7 +397,12 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge and dir in t
        test_must_fail git merge --strategy=recursive dir-in-way &&
 
        test 5 -eq "$(git ls-files -u | wc -l)" &&
-       test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               test 3 -eq "$(git ls-files -u dir~HEAD | wc -l)"
+       else
+               test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)"
+       fi &&
        test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
 
        test_must_fail git diff --quiet &&
@@ -415,7 +420,12 @@ test_expect_success 'Same as previous, but merged other way' '
        test_must_fail git merge --strategy=recursive renamed-file-has-conflicts &&
 
        test 5 -eq "$(git ls-files -u | wc -l)" &&
-       test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               test 3 -eq "$(git ls-files -u dir~renamed-file-has-conflicts | wc -l)"
+       else
+               test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)"
+       fi &&
        test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
 
        test_must_fail git diff --quiet &&
@@ -471,7 +481,12 @@ test_expect_success 'both rename source and destination involved in D/F conflict
        git checkout -q rename-dest^0 &&
        test_must_fail git merge --strategy=recursive source-conflict &&
 
-       test 1 -eq "$(git ls-files -u | wc -l)" &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               test 2 -eq "$(git ls-files -u | wc -l)"
+       else
+               test 1 -eq "$(git ls-files -u | wc -l)"
+       fi &&
 
        test_must_fail git diff --quiet &&
 
@@ -505,34 +520,63 @@ test_expect_success 'setup pair rename to parent of other (D/F conflicts)' '
        git commit -m "Rename one/file -> two"
 '
 
-test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' '
-       git checkout -q rename-one^0 &&
-       mkdir one &&
-       test_must_fail git merge --strategy=recursive rename-two &&
+if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+then
+       test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' '
+               git checkout -q rename-one^0 &&
+               mkdir one &&
+               test_must_fail git merge --strategy=recursive rename-two &&
 
-       test 2 -eq "$(git ls-files -u | wc -l)" &&
-       test 1 -eq "$(git ls-files -u one | wc -l)" &&
-       test 1 -eq "$(git ls-files -u two | wc -l)" &&
+               test 4 -eq "$(git ls-files -u | wc -l)" &&
+               test 2 -eq "$(git ls-files -u one | wc -l)" &&
+               test 2 -eq "$(git ls-files -u two | wc -l)" &&
 
-       test_must_fail git diff --quiet &&
+               test_must_fail git diff --quiet &&
 
-       test 4 -eq $(find . | grep -v .git | wc -l) &&
+               test 3 -eq $(find . | grep -v .git | wc -l) &&
 
-       test_path_is_dir one &&
-       test_path_is_file one~rename-two &&
-       test_path_is_file two &&
-       test "other" = $(cat one~rename-two) &&
-       test "stuff" = $(cat two)
-'
+               test_path_is_file one &&
+               test_path_is_file two &&
+               test "other" = $(cat one) &&
+               test "stuff" = $(cat two)
+       '
+else
+       test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' '
+               git checkout -q rename-one^0 &&
+               mkdir one &&
+               test_must_fail git merge --strategy=recursive rename-two &&
+
+               test 2 -eq "$(git ls-files -u | wc -l)" &&
+               test 1 -eq "$(git ls-files -u one | wc -l)" &&
+               test 1 -eq "$(git ls-files -u two | wc -l)" &&
+
+               test_must_fail git diff --quiet &&
+
+               test 4 -eq $(find . | grep -v .git | wc -l) &&
+
+               test_path_is_dir one &&
+               test_path_is_file one~rename-two &&
+               test_path_is_file two &&
+               test "other" = $(cat one~rename-two) &&
+               test "stuff" = $(cat two)
+       '
+fi
 
 test_expect_success 'pair rename to parent of other (D/F conflicts) w/ clean start' '
        git reset --hard &&
        git clean -fdqx &&
        test_must_fail git merge --strategy=recursive rename-two &&
 
-       test 2 -eq "$(git ls-files -u | wc -l)" &&
-       test 1 -eq "$(git ls-files -u one | wc -l)" &&
-       test 1 -eq "$(git ls-files -u two | wc -l)" &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               test 4 -eq "$(git ls-files -u | wc -l)" &&
+               test 2 -eq "$(git ls-files -u one | wc -l)" &&
+               test 2 -eq "$(git ls-files -u two | wc -l)"
+       else
+               test 2 -eq "$(git ls-files -u | wc -l)" &&
+               test 1 -eq "$(git ls-files -u one | wc -l)" &&
+               test 1 -eq "$(git ls-files -u two | wc -l)"
+       fi &&
 
        test_must_fail git diff --quiet &&
 
@@ -572,12 +616,22 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
        git checkout -q first-rename^0 &&
        test_must_fail git merge --strategy=recursive second-rename &&
 
-       test 5 -eq "$(git ls-files -s | wc -l)" &&
-       test 3 -eq "$(git ls-files -u | wc -l)" &&
-       test 1 -eq "$(git ls-files -u one | wc -l)" &&
-       test 1 -eq "$(git ls-files -u two | wc -l)" &&
-       test 1 -eq "$(git ls-files -u original | wc -l)" &&
-       test 2 -eq "$(git ls-files -o | wc -l)" &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               test 5 -eq "$(git ls-files -s | wc -l)" &&
+               test 3 -eq "$(git ls-files -u | wc -l)" &&
+               test 1 -eq "$(git ls-files -u one~HEAD | wc -l)" &&
+               test 1 -eq "$(git ls-files -u two~second-rename | wc -l)" &&
+               test 1 -eq "$(git ls-files -u original | wc -l)" &&
+               test 0 -eq "$(git ls-files -o | wc -l)"
+       else
+               test 5 -eq "$(git ls-files -s | wc -l)" &&
+               test 3 -eq "$(git ls-files -u | wc -l)" &&
+               test 1 -eq "$(git ls-files -u one | wc -l)" &&
+               test 1 -eq "$(git ls-files -u two | wc -l)" &&
+               test 1 -eq "$(git ls-files -u original | wc -l)" &&
+               test 2 -eq "$(git ls-files -o | wc -l)"
+       fi &&
 
        test_path_is_file one/file &&
        test_path_is_file two/file &&

diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
index 8b3a4fc84309e8858e5015049e94a736942c1616..0317e8397023f421a6365c333ee26df748e4b2b4 100755 (executable)
--- a/t/t6416-recursive-corner-cases.sh
+++ b/t/t6416-recursive-corner-cases.sh
@@ -538,9 +538,15 @@ test_expect_success 'setup differently handled merges of directory/file conflict
 
                git checkout B^0 &&
                test_must_fail git merge C^0 &&
-               git clean -fd &&
-               git rm -rf a/ &&
-               git rm a &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       git rm -rf a/ &&
+                       git rm a~HEAD
+               else
+                       git clean -fd &&
+                       git rm -rf a/ &&
+                       git rm a
+               fi &&
                git cat-file -p B:a >a2 &&
                git add a2 &&
                git commit -m D2 &&
@@ -559,7 +565,12 @@ test_expect_success 'setup differently handled merges of directory/file conflict
 
                git checkout C^0 &&
                test_must_fail git merge B^0 &&
-               git clean -fd &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       git rm a~B^0
+               else
+                       git clean -fd
+               fi &&
                git rm -rf a/ &&
                test_write_lines 1 2 3 4 5 6 7 8 >a &&
                git add a &&
@@ -568,9 +579,15 @@ test_expect_success 'setup differently handled merges of directory/file conflict
 
                git checkout C^0 &&
                test_must_fail git merge B^0 &&
-               git clean -fd &&
-               git rm -rf a/ &&
-               git rm a &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       git rm -rf a/ &&
+                       git rm a~B^0
+               else
+                       git clean -fd &&
+                       git rm -rf a/ &&
+                       git rm a
+               fi &&
                test_write_lines 1 2 3 4 5 6 7 8 >a2 &&
                git add a2 &&
                git commit -m E4 &&
@@ -588,18 +605,34 @@ test_expect_success 'merge of D1 & E1 fails but has appropriate contents' '
 
                test_must_fail git merge -s recursive E1^0 &&
 
-               git ls-files -s >out &&
-               test_line_count = 2 out &&
-               git ls-files -u >out &&
-               test_line_count = 1 out &&
-               git ls-files -o >out &&
-               test_line_count = 1 out &&
-
-               git rev-parse >expect    \
-                       A:ignore-me  B:a &&
-               git rev-parse   >actual   \
-                       :0:ignore-me :2:a &&
-               test_cmp expect actual
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       git ls-files -s >out &&
+                       test_line_count = 3 out &&
+                       git ls-files -u >out &&
+                       test_line_count = 2 out &&
+                       git ls-files -o >out &&
+                       test_line_count = 1 out &&
+
+                       git rev-parse >expect    \
+                               A:ignore-me  B:a  D1:a &&
+                       git rev-parse   >actual   \
+                               :0:ignore-me :1:a :2:a &&
+                       test_cmp expect actual
+               else
+                       git ls-files -s >out &&
+                       test_line_count = 2 out &&
+                       git ls-files -u >out &&
+                       test_line_count = 1 out &&
+                       git ls-files -o >out &&
+                       test_line_count = 1 out &&
+
+                       git rev-parse >expect    \
+                               A:ignore-me  B:a &&
+                       git rev-parse   >actual   \
+                               :0:ignore-me :2:a &&
+                       test_cmp expect actual
+               fi
        )
 '
 
@@ -613,18 +646,34 @@ test_expect_success 'merge of E1 & D1 fails but has appropriate contents' '
 
                test_must_fail git merge -s recursive D1^0 &&
 
-               git ls-files -s >out &&
-               test_line_count = 2 out &&
-               git ls-files -u >out &&
-               test_line_count = 1 out &&
-               git ls-files -o >out &&
-               test_line_count = 1 out &&
-
-               git rev-parse >expect    \
-                       A:ignore-me  B:a &&
-               git rev-parse   >actual   \
-                       :0:ignore-me :3:a &&
-               test_cmp expect actual
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       git ls-files -s >out &&
+                       test_line_count = 3 out &&
+                       git ls-files -u >out &&
+                       test_line_count = 2 out &&
+                       git ls-files -o >out &&
+                       test_line_count = 1 out &&
+
+                       git rev-parse >expect    \
+                               A:ignore-me  B:a  D1:a &&
+                       git rev-parse   >actual   \
+                               :0:ignore-me :1:a :3:a &&
+                       test_cmp expect actual
+               else
+                       git ls-files -s >out &&
+                       test_line_count = 2 out &&
+                       git ls-files -u >out &&
+                       test_line_count = 1 out &&
+                       git ls-files -o >out &&
+                       test_line_count = 1 out &&
+
+                       git rev-parse >expect    \
+                               A:ignore-me  B:a &&
+                       git rev-parse   >actual   \
+                               :0:ignore-me :3:a &&
+                       test_cmp expect actual
+               fi
        )
 '
 
@@ -638,17 +687,32 @@ test_expect_success 'merge of D1 & E2 fails but has appropriate contents' '
 
                test_must_fail git merge -s recursive E2^0 &&
 
-               git ls-files -s >out &&
-               test_line_count = 4 out &&
-               git ls-files -u >out &&
-               test_line_count = 3 out &&
-               git ls-files -o >out &&
-               test_line_count = 2 out &&
-
-               git rev-parse >expect    \
-                       B:a   E2:a/file  C:a/file   A:ignore-me &&
-               git rev-parse   >actual   \
-                       :2:a  :3:a/file  :1:a/file  :0:ignore-me &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       git ls-files -s >out &&
+                       test_line_count = 5 out &&
+                       git ls-files -u >out &&
+                       test_line_count = 4 out &&
+                       git ls-files -o >out &&
+                       test_line_count = 1 out &&
+
+                       git rev-parse >expect    \
+                               B:a       D1:a      E2:a/file  C:a/file   A:ignore-me &&
+                       git rev-parse   >actual   \
+                               :1:a~HEAD :2:a~HEAD :3:a/file  :1:a/file  :0:ignore-me
+               else
+                       git ls-files -s >out &&
+                       test_line_count = 4 out &&
+                       git ls-files -u >out &&
+                       test_line_count = 3 out &&
+                       git ls-files -o >out &&
+                       test_line_count = 2 out &&
+
+                       git rev-parse >expect    \
+                               B:a    E2:a/file  C:a/file   A:ignore-me &&
+                       git rev-parse   >actual   \
+                               :2:a   :3:a/file  :1:a/file  :0:ignore-me
+               fi &&
                test_cmp expect actual &&
 
                test_path_is_file a~HEAD
@@ -665,17 +729,32 @@ test_expect_success 'merge of E2 & D1 fails but has appropriate contents' '
 
                test_must_fail git merge -s recursive D1^0 &&
 
-               git ls-files -s >out &&
-               test_line_count = 4 out &&
-               git ls-files -u >out &&
-               test_line_count = 3 out &&
-               git ls-files -o >out &&
-               test_line_count = 2 out &&
-
-               git rev-parse >expect    \
-                       B:a   E2:a/file  C:a/file   A:ignore-me &&
-               git rev-parse   >actual   \
-                       :3:a  :2:a/file  :1:a/file  :0:ignore-me &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       git ls-files -s >out &&
+                       test_line_count = 5 out &&
+                       git ls-files -u >out &&
+                       test_line_count = 4 out &&
+                       git ls-files -o >out &&
+                       test_line_count = 1 out &&
+
+                       git rev-parse >expect    \
+                               B:a       D1:a      E2:a/file  C:a/file   A:ignore-me &&
+                       git rev-parse   >actual   \
+                               :1:a~D1^0 :3:a~D1^0 :2:a/file  :1:a/file  :0:ignore-me
+               else
+                       git ls-files -s >out &&
+                       test_line_count = 4 out &&
+                       git ls-files -u >out &&
+                       test_line_count = 3 out &&
+                       git ls-files -o >out &&
+                       test_line_count = 2 out &&
+
+                       git rev-parse >expect    \
+                               B:a   E2:a/file  C:a/file   A:ignore-me &&
+                       git rev-parse   >actual   \
+                               :3:a  :2:a/file  :1:a/file  :0:ignore-me
+               fi &&
                test_cmp expect actual &&
 
                test_path_is_file a~D1^0

diff --git a/t/t6422-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh
index 58729593ba80fdf143669ae3849893bd3c8e2858..78bfaf17f077bba18bcd0525feec5620850528f2 100755 (executable)
--- a/t/t6422-merge-rename-corner-cases.sh
+++ b/t/t6422-merge-rename-corner-cases.sh
@@ -313,15 +313,18 @@ test_expect_success 'rename/directory conflict + clean content merge' '
                git ls-files -u >out &&
                test_line_count = 1 out &&
                git ls-files -o >out &&
-               test_line_count = 2 out &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       test_line_count = 1 out
+               else
+                       test_line_count = 2 out
+               fi &&
 
                echo 0 >expect &&
                git cat-file -p base:file >>expect &&
                echo 7 >>expect &&
                test_cmp expect newfile~HEAD &&
 
-               test $(git rev-parse :2:newfile) = $(git hash-object expect) &&
-
                test_path_is_file newfile/realfile &&
                test_path_is_file newfile~HEAD
        )
@@ -344,7 +347,12 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
                git ls-files -u >out &&
                test_line_count = 3 out &&
                git ls-files -o >out &&
-               test_line_count = 2 out &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       test_line_count = 1 out
+               else
+                       test_line_count = 2 out
+               fi &&
 
                git cat-file -p left-conflict:newfile >left &&
                git cat-file -p base:file    >base &&
@@ -356,10 +364,16 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
                        left base right &&
                test_cmp left newfile~HEAD &&
 
-               git rev-parse >expect                                 \
-                       base:file   left-conflict:newfile  right:file &&
-               git rev-parse >actual                                 \
-                       :1:newfile  :2:newfile             :3:newfile &&
+               git rev-parse >expect   \
+                       base:file       left-conflict:newfile right:file &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       git rev-parse >actual \
+                               :1:newfile~HEAD :2:newfile~HEAD :3:newfile~HEAD
+               else
+                       git rev-parse >actual \
+                               :1:newfile      :2:newfile      :3:newfile
+               fi &&
                test_cmp expect actual &&
 
                test_path_is_file newfile/realfile &&

diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh
index 807a424a52a21aeda6c4131c4d93671d48b0c733..5ea77564d778c0788cf07ae3ece4d5c5ce346a9d 100755 (executable)
--- a/t/t6423-merge-rename-directories.sh
+++ b/t/t6423-merge-rename-directories.sh
@@ -1177,10 +1177,18 @@ test_expect_success '5d: Directory/file/file conflict due to directory rename' '
                git ls-files -u >out &&
                test_line_count = 1 out &&
                git ls-files -o >out &&
-               test_line_count = 2 out &&
-
-               git rev-parse >actual \
-                       :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d :0:y/d/e &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       test_line_count = 1 out &&
+
+                       git rev-parse >actual \
+                           :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d~HEAD :0:y/d/e
+               else
+                       test_line_count = 2 out &&
+
+                       git rev-parse >actual \
+                           :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d      :0:y/d/e
+               fi &&
                git rev-parse >expect \
                         O:z/b  O:z/c  B:z/d  B:z/f  A:y/d  B:y/d/e &&
                test_cmp expect actual &&
@@ -2017,17 +2025,32 @@ test_expect_success '7e: transitive rename in rename/delete AND dirs in the way'
                test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
                test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
 
-               git ls-files -s >out &&
-               test_line_count = 5 out &&
-               git ls-files -u >out &&
-               test_line_count = 1 out &&
-               git ls-files -o >out &&
-               test_line_count = 2 out &&
-
-               git rev-parse >actual \
-                       :0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
-               git rev-parse >expect \
-                        A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d &&
+               if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+               then
+                       git ls-files -s >out &&
+                       test_line_count = 6 out &&
+                       git ls-files -u >out &&
+                       test_line_count = 2 out &&
+                       git ls-files -o >out &&
+                       test_line_count = 1 out &&
+
+                       git rev-parse >actual \
+                               :0:x/d/f :0:y/d/g :0:y/b :0:y/c :1:y/d~B^0 :3:y/d~B^0 &&
+                       git rev-parse >expect \
+                                A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d      O:x/d
+               else
+                       git ls-files -s >out &&
+                       test_line_count = 5 out &&
+                       git ls-files -u >out &&
+                       test_line_count = 1 out &&
+                       git ls-files -o >out &&
+                       test_line_count = 2 out &&
+
+                       git rev-parse >actual \
+                               :0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
+                       git rev-parse >expect \
+                                A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d
+               fi &&
                test_cmp expect actual &&
 
                git hash-object y/d~B^0 >actual &&

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index ad288ddc695f7cce0990e3f2bab696f3aff09eb1..70afdd06fa7208a20ac66f1eb6e9e3690d5fe528 100755 (executable)
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -532,7 +532,14 @@ test_expect_success 'file vs modified submodule' '
        yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
        yes "" | git mergetool both &&
        yes "d" | git mergetool file11 file12 &&
-       yes "l" | git mergetool submod &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               yes "c" | git mergetool submod~HEAD &&
+               git rm submod &&
+               git mv submod~HEAD submod
+       else
+               yes "l" | git mergetool submod
+       fi &&
        git submodule update -N &&
        echo "not a submodule" >expect &&
        test_cmp expect submod &&
@@ -549,7 +556,15 @@ test_expect_success 'file vs modified submodule' '
        yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
        yes "" | git mergetool both &&
        yes "d" | git mergetool file11 file12 &&
-       yes "r" | git mergetool submod &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               mv submod submod.orig &&
+               git rm --cached submod &&
+               yes "c" | git mergetool submod~test19 &&
+               git mv submod~test19 submod
+       else
+               yes "r" | git mergetool submod
+       fi &&
        test -d submod.orig &&
        git submodule update -N &&
        echo "not a submodule" >expect &&
@@ -567,6 +582,10 @@ test_expect_success 'file vs modified submodule' '
        yes "" | git mergetool both &&
        yes "d" | git mergetool file11 file12 &&
        yes "l" | git mergetool submod &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               yes "d" | git mergetool submod~test19
+       fi &&
        echo "master submodule" >expect &&
        test_cmp expect submod/bar &&
        git submodule update -N &&
@@ -664,7 +683,14 @@ test_expect_success 'directory vs modified submodule' '
        test_must_fail git merge master &&
        test -n "$(git ls-files -u)" &&
        test ! -e submod.orig &&
-       yes "r" | git mergetool submod &&
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               yes "r" | git mergetool submod~master &&
+               git mv submod submod.orig &&
+               git mv submod~master submod
+       else
+               yes "r" | git mergetool submod
+       fi &&
        test -d submod.orig &&
        echo "not a submodule" >expect &&
        test_cmp expect submod.orig/file16 &&