Merge branch 'bs/maint-commit-options' into maint

diff --git a/t/t4101-apply-nonl.sh b/t/t4101-apply-nonl.sh
index 26b131d0d5567a05e4ce7f386a06147e7b64fd88..da8abcf36418dbd2e9d8ec85871c245991f96fda 100755 (executable)
--- a/t/t4101-apply-nonl.sh
+++ b/t/t4101-apply-nonl.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-apply should handle files with incomplete lines.
+test_description='git apply should handle files with incomplete lines.
 
 '
 . ./test-lib.sh
@@ -20,14 +20,10 @@ do
   for j in 0 1 2 3
   do
     test $i -eq $j && continue
-    diff -u frotz.$i frotz.$j |
-    sed -e '
-       /^---/s|.*|--- a/frotz|
-       /^+++/s|.*|+++ b/frotz|' >diff.$i-$j
     cat frotz.$i >frotz
     test_expect_success \
         "apply diff between $i and $j" \
-       "git-apply <diff.$i-$j && diff frotz.$j frotz"
+       "git apply <../t4101/diff.$i-$j && diff frotz.$j frotz"
   done
 done