Merge git://git.kernel.org/pub/scm/gitk/gitk

[git.git] / t / t3300-funny-names.sh

diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index b5a1400e18b0fa5190fde4d0b60d1563581b2a19..98c133db50a35a62ade6d06c8fc7e1bbdf1714f2 100755 (executable)
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -32,12 +32,12 @@ test -f "$p1" && cmp "$p0" "$p1" || {
 
 echo 'just space
 no-funny' >expected
-test_expect_success 'git-ls-files no-funny' \
-       'git-update-index --add "$p0" "$p2" &&
-       git-ls-files >current &&
+test_expect_success 'git ls-files no-funny' \
+       'git update-index --add "$p0" "$p2" &&
+       git ls-files >current &&
        git diff expected current'
 
-t0=`git-write-tree`
+t0=`git write-tree`
 echo "$t0" >t0
 
 cat > expected <<\EOF
@@ -45,19 +45,19 @@ just space
 no-funny
 "tabs\t,\" (dq) and spaces"
 EOF
-test_expect_success 'git-ls-files with-funny' \
-       'git-update-index --add "$p1" &&
-       git-ls-files >current &&
+test_expect_success 'git ls-files with-funny' \
+       'git update-index --add "$p1" &&
+       git ls-files >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 &&
+test_expect_success 'git ls-files -z with-funny' \
+       'git ls-files -z | tr \\000 \\012 >current &&
        git diff expected current'
 
-t1=`git-write-tree`
+t1=`git write-tree`
 echo "$t1" >t1
 
 cat > expected <<\EOF
@@ -65,45 +65,45 @@ just space
 no-funny
 "tabs\t,\" (dq) and spaces"
 EOF
-test_expect_success 'git-ls-tree with funny' \
-       'git-ls-tree -r $t1 | sed -e "s/^[^     ]*      //" >current &&
+test_expect_success 'git ls-tree with funny' \
+       'git ls-tree -r $t1 | sed -e "s/^[^     ]*      //" >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 &&
+test_expect_success 'git diff-index with-funny' \
+       'git diff-index --name-status $t0 >current &&
        git diff expected current'
 
-test_expect_success 'git-diff-tree with-funny' \
-       'git-diff-tree --name-status $t0 $t1 >current &&
+test_expect_success 'git diff-tree with-funny' \
+       'git diff-tree --name-status $t0 $t1 >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 &&
+test_expect_success 'git diff-index -z with-funny' \
+       'git diff-index -z --name-status $t0 | tr \\000 \\012 >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 &&
+test_expect_success 'git diff-tree -z with-funny' \
+       'git diff-tree -z --name-status $t0 $t1 | tr \\000 \\012 >current &&
        git diff expected current'
 
 cat > expected <<\EOF
 CNUM   no-funny        "tabs\t,\" (dq) and spaces"
 EOF
-test_expect_success 'git-diff-tree -C with-funny' \
-       'git-diff-tree -C --find-copies-harder --name-status \
+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 &&
        git diff expected current'
 
 cat > expected <<\EOF
 RNUM   no-funny        "tabs\t,\" (dq) and spaces"
 EOF
-test_expect_success 'git-diff-tree delete with-funny' \
-       'git-update-index --force-remove "$p0" &&
-       git-diff-index -M --name-status \
+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 &&
        git diff expected current'
 
@@ -113,8 +113,8 @@ similarity index NUM%
 rename from no-funny
 rename to "tabs\t,\" (dq) and spaces"
 EOF
-test_expect_success 'git-diff-tree delete with-funny' \
-       'git-diff-index -M -p $t0 |
+test_expect_success 'git diff-tree delete with-funny' \
+       'git diff-index -M -p $t0 |
         sed -e "s/index [0-9]*%/index NUM%/" >current &&
         git diff expected current'
 
@@ -127,8 +127,8 @@ similarity index NUM%
 rename from no-funny
 rename to "tabs\t,\" (dq) and spaces"
 EOF
-test_expect_success 'git-diff-tree delete with-funny' \
-       'git-diff-index -M -p $t0 |
+test_expect_success 'git diff-tree delete with-funny' \
+       'git diff-index -M -p $t0 |
         sed -e "s/index [0-9]*%/index NUM%/" >current &&
         git diff expected current'
 
@@ -136,9 +136,9 @@ cat >expected <<\EOF
  "tabs\t,\" (dq) and spaces"
  1 files changed, 0 insertions(+), 0 deletions(-)
 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 &&
+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 &&
         git diff expected current'
 
 cat > expected <<\EOF
@@ -146,15 +146,15 @@ cat > expected <<\EOF
  "tabs\t,\" (dq) and spaces"
  2 files changed, 3 insertions(+), 3 deletions(-)
 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 &&
+test_expect_success 'git diff-tree delete with-funny applied' \
+       'git diff-index -p $t0 |
+        git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
         git diff expected current'
 
-test_expect_success 'git-apply non-git diff' \
-       'git-diff-index -p $t0 |
+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 &&
+        git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
         git diff expected current'
 
 test_done