Merge 1.5.0.5 in from 'maint'

diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index c12270efab80e715e50440a0ae6d05555b055481..b5a1400e18b0fa5190fde4d0b60d1563581b2a19 100755 (executable)
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -35,7 +35,7 @@ no-funny' >expected
 test_expect_success 'git-ls-files no-funny' \
        'git-update-index --add "$p0" "$p2" &&
        git-ls-files >current &&
-       diff -u expected current'
+       git diff expected current'
 
 t0=`git-write-tree`
 echo "$t0" >t0
@@ -48,14 +48,14 @@ EOF
 test_expect_success 'git-ls-files with-funny' \
        'git-update-index --add "$p1" &&
        git-ls-files >current &&
-       diff -u expected current'
+       git diff expected current'
 
 echo 'just space
 no-funny
 tabs   ," (dq) and spaces' >expected
 test_expect_success 'git-ls-files -z with-funny' \
        'git-ls-files -z | tr \\0 \\012 >current &&
-       diff -u expected current'
+       git diff expected current'
 
 t1=`git-write-tree`
 echo "$t1" >t1
@@ -67,28 +67,28 @@ no-funny
 EOF
 test_expect_success 'git-ls-tree with funny' \
        'git-ls-tree -r $t1 | sed -e "s/^[^     ]*      //" >current &&
-        diff -u expected current'
+        git diff expected current'
 
 cat > expected <<\EOF
 A      "tabs\t,\" (dq) and spaces"
 EOF
 test_expect_success 'git-diff-index with-funny' \
        'git-diff-index --name-status $t0 >current &&
-       diff -u expected current'
+       git diff expected current'
 
 test_expect_success 'git-diff-tree with-funny' \
        'git-diff-tree --name-status $t0 $t1 >current &&
-       diff -u expected current'
+       git diff expected current'
 
 echo 'A
 tabs   ," (dq) and spaces' >expected
 test_expect_success 'git-diff-index -z with-funny' \
        'git-diff-index -z --name-status $t0 | tr \\0 \\012 >current &&
-       diff -u expected current'
+       git diff expected current'
 
 test_expect_success 'git-diff-tree -z with-funny' \
        'git-diff-tree -z --name-status $t0 $t1 | tr \\0 \\012 >current &&
-       diff -u expected current'
+       git diff expected current'
 
 cat > expected <<\EOF
 CNUM   no-funny        "tabs\t,\" (dq) and spaces"
@@ -96,7 +96,7 @@ EOF
 test_expect_success 'git-diff-tree -C with-funny' \
        'git-diff-tree -C --find-copies-harder --name-status \
                $t0 $t1 | sed -e 's/^C[0-9]*/CNUM/' >current &&
-       diff -u expected current'
+       git diff expected current'
 
 cat > expected <<\EOF
 RNUM   no-funny        "tabs\t,\" (dq) and spaces"
@@ -105,7 +105,7 @@ test_expect_success 'git-diff-tree delete with-funny' \
        'git-update-index --force-remove "$p0" &&
        git-diff-index -M --name-status \
                $t0 | sed -e 's/^R[0-9]*/RNUM/' >current &&
-       diff -u expected current'
+       git diff expected current'
 
 cat > expected <<\EOF
 diff --git a/no-funny "b/tabs\t,\" (dq) and spaces"
@@ -116,7 +116,7 @@ EOF
 test_expect_success 'git-diff-tree delete with-funny' \
        'git-diff-index -M -p $t0 |
         sed -e "s/index [0-9]*%/index NUM%/" >current &&
-        diff -u expected current'
+        git diff expected current'
 
 chmod +x "$p1"
 cat > expected <<\EOF
@@ -130,7 +130,7 @@ EOF
 test_expect_success 'git-diff-tree delete with-funny' \
        'git-diff-index -M -p $t0 |
         sed -e "s/index [0-9]*%/index NUM%/" >current &&
-        diff -u expected current'
+        git diff expected current'
 
 cat >expected <<\EOF
  "tabs\t,\" (dq) and spaces"
@@ -139,7 +139,7 @@ EOF
 test_expect_success 'git-diff-tree rename with-funny applied' \
        'git-diff-index -M -p $t0 |
         git-apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
-        diff -u expected current'
+        git diff expected current'
 
 cat > expected <<\EOF
  no-funny
@@ -149,12 +149,12 @@ EOF
 test_expect_success 'git-diff-tree delete with-funny applied' \
        'git-diff-index -p $t0 |
         git-apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
-        diff -u expected current'
+        git diff expected current'
 
 test_expect_success 'git-apply non-git diff' \
        'git-diff-index -p $t0 |
         sed -ne "/^[-+@]/p" |
         git-apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
-        diff -u expected current'
+        git diff expected current'
 
 test_done