Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh
index 690a1820032025056307de8926e8f56826c29367..f92e259cc6f251ec6f89edee3fc16720f264d82f 100755 (executable)
--- a/t/t4118-apply-empty-context.sh
+++ b/t/t4118-apply-empty-context.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Junio C Hamano
 #
 
-test_description='git-apply with new style GNU diff with empty context
+test_description='git apply with new style GNU diff with empty context
 
 '
 
@@ -23,7 +23,8 @@ test_expect_success setup '
        cat file2 >file2.orig
        git add file1 file2 &&
        sed -e "/^B/d" <file1.orig >file1 &&
-       sed -e "/^B/d" <file2.orig >file2 &&
+       sed -e "/^[BQ]/d" <file2.orig >file2 &&
+       echo Q | tr -d "\\012" >>file2 &&
        cat file1 >file1.mods &&
        cat file2 >file2.mods &&
        git diff |
@@ -37,7 +38,7 @@ test_expect_success 'apply --numstat' '
                echo "0 1       file1" &&
                echo "0 1       file2"
        } >expect &&
-       git diff expect actual
+       test_cmp expect actual
 
 '
 
@@ -47,9 +48,8 @@ test_expect_success 'apply --apply' '
        cat file2.orig >file2 &&
        git update-index file1 file2 &&
        git apply --index diff.output &&
-       git diff file1.mods file1 &&
-       git diff file2.mods file2
+       test_cmp file1.mods file1 &&
+       test_cmp file2.mods file2
 '
 
 test_done
-