Merge branch 'master' of https://github.com/vnwildman/git

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index ab9da61da391f1b6040076dda2454f602adef7d2..72b9b375baa6b26d0bca91c0c2d214cd4a9b8a42 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -116,9 +116,8 @@ test_expect_success "checkout -m with dirty tree" '
        git diff --name-status side >current.side &&
        test_cmp expect.side current.side &&
 
-       : >expect.index &&
        git diff --cached >current.index &&
-       test_cmp expect.index current.index
+       test_must_be_empty current.index
 '
 
 test_expect_success "checkout -m with dirty tree, renamed" '
@@ -139,7 +138,7 @@ test_expect_success "checkout -m with dirty tree, renamed" '
        test_cmp expect uno &&
        ! test -f one &&
        git diff --cached >current &&
-       ! test -s current
+       test_must_be_empty current
 
 '
 
@@ -161,9 +160,9 @@ test_expect_success 'checkout -m with merge conflict' '
        git diff master:one :3:uno |
        sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
        fill d2 aT d7 aS >expect &&
-       test_cmp current expect &&
+       test_cmp expect current &&
        git diff --cached two >current &&
-       ! test -s current
+       test_must_be_empty current
 '
 
 test_expect_success 'format of merge conflict from checkout -m' '
@@ -175,7 +174,7 @@ test_expect_success 'format of merge conflict from checkout -m' '
 
        git ls-files >current &&
        fill same two two two >expect &&
-       test_cmp current expect &&
+       test_cmp expect current &&
 
        cat <<-EOF >expect &&
        <<<<<<< simple
@@ -255,9 +254,9 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' '
 test_expect_success 'checkout to detach HEAD' '
        git config advice.detachedHead true &&
        git checkout -f renamer && git clean -f &&
-       git checkout renamer^ 2>messages &&
-       test_i18ngrep "HEAD is now at 7329388" messages &&
-       (test_line_count -gt 1 messages || test -n "$GETTEXT_POISON") &&
+       GIT_TEST_GETTEXT_POISON= git checkout renamer^ 2>messages &&
+       grep "HEAD is now at 7329388" messages &&
+       test_line_count -gt 1 messages &&
        H=$(git rev-parse --verify HEAD) &&
        M=$(git show-ref -s --verify refs/heads/master) &&
        test "z$H" = "z$M" &&
@@ -528,10 +527,10 @@ test_expect_success 'checkout with --merge' '
        cat sample >filf &&
        git checkout -m -- fild file filf &&
        (
-               echo "<<<<<<< ours"
-               echo ourside
-               echo "======="
-               echo theirside
+               echo "<<<<<<< ours" &&
+               echo ourside &&
+               echo "=======" &&
+               echo theirside &&
                echo ">>>>>>> theirs"
        ) >merged &&
        test_cmp expect fild &&
@@ -549,12 +548,12 @@ test_expect_success 'checkout with --merge, in diff3 -m style' '
        cat sample >filf &&
        git checkout -m -- fild file filf &&
        (
-               echo "<<<<<<< ours"
-               echo ourside
-               echo "||||||| base"
-               echo original
-               echo "======="
-               echo theirside
+               echo "<<<<<<< ours" &&
+               echo ourside &&
+               echo "||||||| base" &&
+               echo original &&
+               echo "=======" &&
+               echo theirside &&
                echo ">>>>>>> theirs"
        ) >merged &&
        test_cmp expect fild &&
@@ -572,10 +571,10 @@ test_expect_success 'checkout --conflict=merge, overriding config' '
        cat sample >filf &&
        git checkout --conflict=merge -- fild file filf &&
        (
-               echo "<<<<<<< ours"
-               echo ourside
-               echo "======="
-               echo theirside
+               echo "<<<<<<< ours" &&
+               echo ourside &&
+               echo "=======" &&
+               echo theirside &&
                echo ">>>>>>> theirs"
        ) >merged &&
        test_cmp expect fild &&
@@ -593,12 +592,12 @@ test_expect_success 'checkout --conflict=diff3' '
        cat sample >filf &&
        git checkout --conflict=diff3 -- fild file filf &&
        (
-               echo "<<<<<<< ours"
-               echo ourside
-               echo "||||||| base"
-               echo original
-               echo "======="
-               echo theirside
+               echo "<<<<<<< ours" &&
+               echo ourside &&
+               echo "||||||| base" &&
+               echo original &&
+               echo "=======" &&
+               echo theirside &&
                echo ">>>>>>> theirs"
        ) >merged &&
        test_cmp expect fild &&
@@ -673,7 +672,6 @@ test_expect_success 'custom merge driver with checkout -m' '
                do
                        grep $t arm || exit 1
                done
-               exit 0
        ) &&
 
        mv arm expect &&