Merge branch 'jc/apply-reject-noop-hunk'

diff --git a/t/t6005-rev-list-count.sh b/t/t6005-rev-list-count.sh
index 334fccf58ca01d391d553f51711a448948fe86fa..0b64822bf621dee5c9544f76013c0342412eaee6 100755 (executable)
--- a/t/t6005-rev-list-count.sh
+++ b/t/t6005-rev-list-count.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-rev-list --max-count and --skip test'
+test_description='git rev-list --max-count and --skip test'
 
 . ./test-lib.sh
 
@@ -13,39 +13,39 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'no options' '
-    test $(git-rev-list HEAD | wc -l) = 5
+    test $(git rev-list HEAD | wc -l) = 5
 '
 
 test_expect_success '--max-count' '
-    test $(git-rev-list HEAD --max-count=0 | wc -l) = 0 &&
-    test $(git-rev-list HEAD --max-count=3 | wc -l) = 3 &&
-    test $(git-rev-list HEAD --max-count=5 | wc -l) = 5 &&
-    test $(git-rev-list HEAD --max-count=10 | wc -l) = 5
+    test $(git rev-list HEAD --max-count=0 | wc -l) = 0 &&
+    test $(git rev-list HEAD --max-count=3 | wc -l) = 3 &&
+    test $(git rev-list HEAD --max-count=5 | wc -l) = 5 &&
+    test $(git rev-list HEAD --max-count=10 | wc -l) = 5
 '
 
 test_expect_success '--max-count all forms' '
-    test $(git-rev-list HEAD --max-count=1 | wc -l) = 1 &&
-    test $(git-rev-list HEAD -1 | wc -l) = 1 &&
-    test $(git-rev-list HEAD -n1 | wc -l) = 1 &&
-    test $(git-rev-list HEAD -n 1 | wc -l) = 1
+    test $(git rev-list HEAD --max-count=1 | wc -l) = 1 &&
+    test $(git rev-list HEAD -1 | wc -l) = 1 &&
+    test $(git rev-list HEAD -n1 | wc -l) = 1 &&
+    test $(git rev-list HEAD -n 1 | wc -l) = 1
 '
 
 test_expect_success '--skip' '
-    test $(git-rev-list HEAD --skip=0 | wc -l) = 5 &&
-    test $(git-rev-list HEAD --skip=3 | wc -l) = 2 &&
-    test $(git-rev-list HEAD --skip=5 | wc -l) = 0 &&
-    test $(git-rev-list HEAD --skip=10 | wc -l) = 0
+    test $(git rev-list HEAD --skip=0 | wc -l) = 5 &&
+    test $(git rev-list HEAD --skip=3 | wc -l) = 2 &&
+    test $(git rev-list HEAD --skip=5 | wc -l) = 0 &&
+    test $(git rev-list HEAD --skip=10 | wc -l) = 0
 '
 
 test_expect_success '--skip --max-count' '
-    test $(git-rev-list HEAD --skip=0 --max-count=0 | wc -l) = 0 &&
-    test $(git-rev-list HEAD --skip=0 --max-count=10 | wc -l) = 5 &&
-    test $(git-rev-list HEAD --skip=3 --max-count=0 | wc -l) = 0 &&
-    test $(git-rev-list HEAD --skip=3 --max-count=1 | wc -l) = 1 &&
-    test $(git-rev-list HEAD --skip=3 --max-count=2 | wc -l) = 2 &&
-    test $(git-rev-list HEAD --skip=3 --max-count=10 | wc -l) = 2 &&
-    test $(git-rev-list HEAD --skip=5 --max-count=10 | wc -l) = 0 &&
-    test $(git-rev-list HEAD --skip=10 --max-count=10 | wc -l) = 0
+    test $(git rev-list HEAD --skip=0 --max-count=0 | wc -l) = 0 &&
+    test $(git rev-list HEAD --skip=0 --max-count=10 | wc -l) = 5 &&
+    test $(git rev-list HEAD --skip=3 --max-count=0 | wc -l) = 0 &&
+    test $(git rev-list HEAD --skip=3 --max-count=1 | wc -l) = 1 &&
+    test $(git rev-list HEAD --skip=3 --max-count=2 | wc -l) = 2 &&
+    test $(git rev-list HEAD --skip=3 --max-count=10 | wc -l) = 2 &&
+    test $(git rev-list HEAD --skip=5 --max-count=10 | wc -l) = 0 &&
+    test $(git rev-list HEAD --skip=10 --max-count=10 | wc -l) = 0
 '
 
 test_done