Merge branch 'js/update-index-ignore-removal-for-skip-worktree'

[thirdparty/git.git] / t / t3030-merge-recursive.sh

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index faa8892741f23956a29352578c73a2b493950de2..2170758e38d786709425f3f39f2c481352e82e8e 100755 (executable)
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -695,15 +695,22 @@ test_expect_success 'merging with triple rename across D/F conflict' '
 test_expect_success 'merge-recursive remembers the names of all base trees' '
        git reset --hard HEAD &&
 
+       # make the index match $c1 so that merge-recursive below does not
+       # fail early
+       git diff --binary HEAD $c1 -- | git apply --cached &&
+
        # more trees than static slots used by oid_to_hex()
        for commit in $c0 $c2 $c4 $c5 $c6 $c7
        do
                git rev-parse "$commit^{tree}"
        done >trees &&
 
-       # ignore the return code -- it only fails because the input is weird
+       # ignore the return code; it only fails because the input is weird...
        test_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out &&
 
+       # ...but make sure it fails in the expected way
+       test_i18ngrep CONFLICT.*rename/rename out &&
+
        # merge-recursive prints in reverse order, but we do not care
        sort <trees >expect &&
        sed -n "s/^virtual //p" out | sort >actual &&