Merge branch 'jc/maint-reflog-expire-clean-mark-typofix'

diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index d5f2cfb186110160df47a450e2f76206b85ee51b..7674dd2ec9d6f14a0f2181ebf415378521f90fa4 100755 (executable)
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -3,13 +3,13 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-apply symlinks and partial files
+test_description='git apply symlinks and partial files
 
 '
 
 . ./test-lib.sh
 
-test_expect_success setup '
+test_expect_success SYMLINKS setup '
 
        ln -s path1/path2/path3/path4/path5 link1 &&
        git add link? &&
@@ -28,21 +28,21 @@ test_expect_success setup '
 
 '
 
-test_expect_success 'apply symlink patch' '
+test_expect_success SYMLINKS 'apply symlink patch' '
 
        git checkout side &&
        git apply patch &&
        git diff-files -p >patched &&
-       diff -u patch patched
+       test_cmp patch patched
 
 '
 
-test_expect_success 'apply --index symlink patch' '
+test_expect_success SYMLINKS 'apply --index symlink patch' '
 
        git checkout -f side &&
        git apply --index patch &&
        git diff-index --cached -p HEAD >patched &&
-       diff -u patch patched
+       test_cmp patch patched
 
 '