Merge branch 'maint' to catch up with 1.5.3.5

diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh
index 6579f06b05c91f00f4f45015894f2bfab1076bf6..435f65b370e8855c4aca6adfbf12c098338f3b45 100755 (executable)
--- a/t/t4100-apply-stat.sh
+++ b/t/t4100-apply-stat.sh
@@ -3,45 +3,44 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-apply --stat --summary test.
+test_description='git apply --stat --summary test.
 
 '
 . ./test-lib.sh
 
 test_expect_success \
     'rename' \
-    'git-apply --stat --summary <../t4100/t-apply-1.patch >current &&
-    diff -u ../t4100/t-apply-1.expect current'
+    'git apply --stat --summary <../t4100/t-apply-1.patch >current &&
+    git diff ../t4100/t-apply-1.expect current'
 
 test_expect_success \
     'copy' \
-    'git-apply --stat --summary <../t4100/t-apply-2.patch >current &&
-    diff -u ../t4100/t-apply-2.expect current'
+    'git apply --stat --summary <../t4100/t-apply-2.patch >current &&
+    git diff ../t4100/t-apply-2.expect current'
 
 test_expect_success \
     'rewrite' \
-    'git-apply --stat --summary <../t4100/t-apply-3.patch >current &&
-    diff -u ../t4100/t-apply-3.expect current'
+    'git apply --stat --summary <../t4100/t-apply-3.patch >current &&
+    git diff ../t4100/t-apply-3.expect current'
 
 test_expect_success \
     'mode' \
-    'git-apply --stat --summary <../t4100/t-apply-4.patch >current &&
-    diff -u ../t4100/t-apply-4.expect current'
+    'git apply --stat --summary <../t4100/t-apply-4.patch >current &&
+    git diff ../t4100/t-apply-4.expect current'
 
 test_expect_success \
     'non git' \
-    'git-apply --stat --summary <../t4100/t-apply-5.patch >current &&
-    diff -u ../t4100/t-apply-5.expect current'
+    'git apply --stat --summary <../t4100/t-apply-5.patch >current &&
+    git diff ../t4100/t-apply-5.expect current'
 
 test_expect_success \
     'non git' \
-    'git-apply --stat --summary <../t4100/t-apply-6.patch >current &&
-    diff -u ../t4100/t-apply-6.expect current'
+    'git apply --stat --summary <../t4100/t-apply-6.patch >current &&
+    git diff ../t4100/t-apply-6.expect current'
 
 test_expect_success \
     'non git' \
-    'git-apply --stat --summary <../t4100/t-apply-7.patch >current &&
-    diff -u ../t4100/t-apply-7.expect current'
+    'git apply --stat --summary <../t4100/t-apply-7.patch >current &&
+    git diff ../t4100/t-apply-7.expect current'
 
 test_done
-