Merge branch 'jn/maint-test-merge-verify-parents'

[git.git] / t / t7600-merge.sh

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index c665acdd0a128667a93c57a7942c5bd7a44b2d8b..b7cac228fd610652aba1bcba08bcf15f03c9d714 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -89,6 +89,7 @@ verify_parents () {
                i=$(expr $i + 1) ||
                return 1
        done &&
+       test_must_fail git rev-parse --verify "HEAD^$i" &&
        test_cmp parents.expected parents.actual
 }
 
@@ -493,10 +494,10 @@ test_expect_success 'merge fast-forward in a dirty tree' '
 
 test_debug 'git log --graph --decorate --oneline --all'
 
-test_expect_success C_LOCALE_OUTPUT 'in-index merge' '
+test_expect_success 'in-index merge' '
        git reset --hard c0 &&
        git merge --no-ff -s resolve c1 >out &&
-       grep "Wonderful." out &&
+       test_i18ngrep "Wonderful." out &&
        verify_parents $c0 $c1
 '