t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge

diff --git a/t/t1003-read-tree-prefix.sh b/t/t1003-read-tree-prefix.sh
index 48ab117d755ca606a09d848af9747e24ea13a26f..8c6d67edda1468ba0f1c7afc6d13ea3a7bbe0a90 100755 (executable)
--- a/t/t1003-read-tree-prefix.sh
+++ b/t/t1003-read-tree-prefix.sh
@@ -3,15 +3,15 @@
 # Copyright (c) 2006 Junio C Hamano
 #
 
-test_description='git-read-tree --prefix test.
+test_description='git read-tree --prefix test.
 '
 
 . ./test-lib.sh
 
 test_expect_success setup '
        echo hello >one &&
-       git-update-index --add one &&
-       tree=`git-write-tree` &&
+       git update-index --add one &&
+       tree=`git write-tree` &&
        echo tree is $tree
 '
 
@@ -19,8 +19,8 @@ echo 'one
 two/one' >expect
 
 test_expect_success 'read-tree --prefix' '
-       git-read-tree --prefix=two/ $tree &&
-       git-ls-files >actual &&
+       git read-tree --prefix=two/ $tree &&
+       git ls-files >actual &&
        cmp expect actual
 '