X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4118-apply-empty-context.sh;h=1d531caf798b9e8dfbe17714ad1eb09be14f7f93;hb=da0204df587ae76cd291bc7e495fc60d873c2f20;hp=7309422fe520ee5f459713da85b255233c0de9a5;hpb=eec102524fda2df7d2846e865805ca213119bf10;p=git.git

diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh
index 7309422fe..1d531caf7 100755
--- 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 &&
-	diff -u expect actual
+	git diff 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 &&
-	diff -u file1.mods file1 &&
-	diff -u file2.mods file2
+	git diff file1.mods file1 &&
+	git diff file2.mods file2
 '
 
 test_done
-