Merge branch 'rs/logical-vs-binary-or' into maint

diff --git a/t/t3002-ls-files-dashpath.sh b/t/t3002-ls-files-dashpath.sh
index cc8967d76b10e18eb6b7db69fbb31baf702f2efc..8704b04e1b4150357a7a01c91ac59bb1f22cbb8e 100755 (executable)
--- a/t/t3002-ls-files-dashpath.sh
+++ b/t/t3002-ls-files-dashpath.sh
@@ -3,9 +3,9 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-ls-files test (-- to terminate the path list).
+test_description='git ls-files test (-- to terminate the path list).
 
-This test runs git-ls-files --others with the following on the
+This test runs git ls-files --others with the following on the
 filesystem.
 
     path0       - a file
@@ -21,9 +21,9 @@ test_expect_success \
        echo frotz >./--'
 
 test_expect_success \
-    'git-ls-files without path restriction.' \
-    'git-ls-files --others >output &&
-     git diff output - <<EOF
+    'git ls-files without path restriction.' \
+    'git ls-files --others >output &&
+     test_cmp output - <<EOF
 --
 -foo
 output
@@ -32,33 +32,33 @@ EOF
 '
 
 test_expect_success \
-    'git-ls-files with path restriction.' \
-    'git-ls-files --others path0 >output &&
-       git diff output - <<EOF
+    'git ls-files with path restriction.' \
+    'git ls-files --others path0 >output &&
+       test_cmp output - <<EOF
 path0
 EOF
 '
 
 test_expect_success \
-    'git-ls-files with path restriction with --.' \
-    'git-ls-files --others -- path0 >output &&
-       git diff output - <<EOF
+    'git ls-files with path restriction with --.' \
+    'git ls-files --others -- path0 >output &&
+       test_cmp output - <<EOF
 path0
 EOF
 '
 
 test_expect_success \
-    'git-ls-files with path restriction with -- --.' \
-    'git-ls-files --others -- -- >output &&
-       git diff output - <<EOF
+    'git ls-files with path restriction with -- --.' \
+    'git ls-files --others -- -- >output &&
+       test_cmp output - <<EOF
 --
 EOF
 '
 
 test_expect_success \
-    'git-ls-files with no path restriction.' \
-    'git-ls-files --others -- >output &&
-       git diff output - <<EOF
+    'git ls-files with no path restriction.' \
+    'git ls-files --others -- >output &&
+       test_cmp output - <<EOF
 --
 -foo
 output