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

diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh
index 2ff800c23f8f833393c9eb7f50c89bd1a790094f..e7e2913de745cc9f7639103757933f6238fdd564 100755 (executable)
--- a/t/t4104-apply-boundary.sh
+++ b/t/t4104-apply-boundary.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-apply boundary tests
+test_description='git apply boundary tests
 
 '
 . ./test-lib.sh
@@ -90,7 +90,7 @@ do
                                cat '"$kind-patch.$with"'
                                (exit 1)
                        } &&
-                       diff -u '"$kind"'-expect victim
+                       test_cmp '"$kind"'-expect victim
                '
        done
 done
@@ -108,8 +108,21 @@ do
                        cat '"$kind-ng.without"'
                        (exit 1)
                } &&
-               diff -u '"$kind"'-expect victim
+               test_cmp '"$kind"'-expect victim
        '
 done
 
+test_expect_success 'two lines' '
+
+       >file &&
+       git add file &&
+       echo aaa >file &&
+       git diff >patch &&
+       git add file &&
+       echo bbb >file &&
+       git add file &&
+       test_must_fail git apply --check patch
+
+'
+
 test_done