t4205: sort log output in a hash-independent way

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 470f33466ca561484da080a522add72bed51ad6e..3563e77b374c69a138bdfa3b274b75b6094c55a7 100755 (executable)
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -525,20 +525,22 @@ test_expect_success 'merge-recursive w/ empty work tree - ours has rename' '
                GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
                export GIT_INDEX_FILE &&
                mkdir "$GIT_WORK_TREE" &&
-               git read-tree -i -m $c7 &&
-               git update-index --ignore-missing --refresh &&
-               git merge-recursive $c0 -- $c7 $c3 &&
-               git ls-files -s >actual-files
-       ) 2>actual-err &&
-       >expected-err &&
+               git read-tree -i -m $c7 2>actual-err &&
+               test_must_be_empty actual-err &&
+               git update-index --ignore-missing --refresh 2>actual-err &&
+               test_must_be_empty actual-err &&
+               git merge-recursive $c0 -- $c7 $c3 2>actual-err &&
+               test_must_be_empty actual-err &&
+               git ls-files -s >actual-files 2>actual-err &&
+               test_must_be_empty actual-err
+       ) &&
        cat >expected-files <<-EOF &&
        100644 $o3 0    b/c
        100644 $o0 0    c
        100644 $o0 0    d/e
        100644 $o0 0    e
        EOF
-       test_cmp expected-files actual-files &&
-       test_cmp expected-err actual-err
+       test_cmp expected-files actual-files
 '
 
 test_expect_success 'merge-recursive w/ empty work tree - theirs has rename' '
@@ -548,20 +550,22 @@ test_expect_success 'merge-recursive w/ empty work tree - theirs has rename' '
                GIT_INDEX_FILE="$PWD/theirs-has-rename-index" &&
                export GIT_INDEX_FILE &&
                mkdir "$GIT_WORK_TREE" &&
-               git read-tree -i -m $c3 &&
-               git update-index --ignore-missing --refresh &&
-               git merge-recursive $c0 -- $c3 $c7 &&
-               git ls-files -s >actual-files
-       ) 2>actual-err &&
-       >expected-err &&
+               git read-tree -i -m $c3 2>actual-err &&
+               test_must_be_empty actual-err &&
+               git update-index --ignore-missing --refresh 2>actual-err &&
+               test_must_be_empty actual-err &&
+               git merge-recursive $c0 -- $c3 $c7 2>actual-err &&
+               test_must_be_empty actual-err &&
+               git ls-files -s >actual-files 2>actual-err &&
+               test_must_be_empty actual-err
+       ) &&
        cat >expected-files <<-EOF &&
        100644 $o3 0    b/c
        100644 $o0 0    c
        100644 $o0 0    d/e
        100644 $o0 0    e
        EOF
-       test_cmp expected-files actual-files &&
-       test_cmp expected-err actual-err
+       test_cmp expected-files actual-files
 '
 
 test_expect_success 'merge removes empty directories' '
@@ -575,13 +579,13 @@ test_expect_success 'merge removes empty directories' '
        test_must_fail test -d d
 '
 
-test_expect_failure 'merge-recursive simple w/submodule' '
+test_expect_success 'merge-recursive simple w/submodule' '
 
        git checkout submod &&
        git merge remove
 '
 
-test_expect_failure 'merge-recursive simple w/submodule result' '
+test_expect_success 'merge-recursive simple w/submodule result' '
 
        git ls-files -s >actual &&
        (
@@ -678,4 +682,54 @@ test_expect_success 'merge-recursive remembers the names of all base trees' '
        test_cmp expect actual
 '
 
+test_expect_success 'merge-recursive internal merge resolves to the sameness' '
+       git reset --hard HEAD &&
+
+       # We are going to create a history leading to two criss-cross
+       # branches A and B.  The common ancestor at the bottom, O0,
+       # has two child commits O1 and O2, both of which will be merge
+       # base between A and B, like so:
+       #
+       #       O1---A
+       #      /  \ /
+       #    O0    .
+       #      \  / \
+       #       O2---B
+       #
+       # The recently added "check to see if the index is different from
+       # the tree into which something else is getting merged" check must
+       # NOT kick in when an inner merge between O1 and O2 is made.  Both
+       # O1 and O2 happen to have the same tree as O0 in this test to
+       # trigger the bug---whether the inner merge is made by merging O2
+       # into O1 or O1 into O2, their common ancestor O0 and the branch
+       # being merged have the same tree.  We should not trigger the "is
+       # the index dirty?" check in this case.
+
+       echo "zero" >file &&
+       git add file &&
+       test_tick &&
+       git commit -m "O0" &&
+       O0=$(git rev-parse HEAD) &&
+
+       test_tick &&
+       git commit --allow-empty -m "O1" &&
+       O1=$(git rev-parse HEAD) &&
+
+       git reset --hard $O0 &&
+       test_tick &&
+       git commit --allow-empty -m "O2" &&
+       O2=$(git rev-parse HEAD) &&
+
+       test_tick &&
+       git merge -s ours $O1 &&
+       B=$(git rev-parse HEAD) &&
+
+       git reset --hard $O1 &&
+       test_tick &&
+       git merge -s ours $O2 &&
+       A=$(git rev-parse HEAD) &&
+
+       git merge $B
+'
+
 test_done