tests: use "git xyzzy" form (t3600 - t6999)

Converts tests between t3600-t6300.

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 79c06adf1f035cf727771974b2f9713da9d2fb8c..558c80edbfa5c0c90566a0be94723e2783d6df9b 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -12,14 +12,14 @@ test_expect_success \
     'Initialize test directory' \
     "touch -- foo bar baz 'space embedded' -q &&
      git add -- foo bar baz 'space embedded' -q &&
     'Initialize test directory' \
     "touch -- foo bar baz 'space embedded' -q &&
      git add -- foo bar baz 'space embedded' -q &&

-     git-commit -m 'add normal files' &&
+     git commit -m 'add normal files' &&

      test_tabs=y &&
      if touch -- 'tab  embedded' 'newline
 embedded'
      then
      git add -- 'tab   embedded' 'newline
 embedded' &&
      test_tabs=y &&
      if touch -- 'tab  embedded' 'newline
 embedded'
      then
      git add -- 'tab   embedded' 'newline
 embedded' &&

-     git-commit -m 'add files with tabs and newlines'
+     git commit -m 'add files with tabs and newlines'

      else
          say 'Your filesystem does not allow tabs in filenames.'
          test_tabs=n
      else
          say 'Your filesystem does not allow tabs in filenames.'
          test_tabs=n

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index eced1f30fb8475739aef52230bbb79946a0f76d8..64c372a025bd78afc3d3a2ce13543561f9c97706 100755 (executable)
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -61,7 +61,7 @@ test_expect_success 'apply detecting corrupt patch correctly' \
         detected=`sed -ne "${detected}p" broken` &&
         test "$detected" = xCIT'
 
         detected=`sed -ne "${detected}p" broken` &&
         test "$detected" = xCIT'
 

-test_expect_success 'initial commit' 'git-commit -a -m initial'
+test_expect_success 'initial commit' 'git commit -a -m initial'

 
 # Try removal (b), modification (d), and creation (e).
 test_expect_success 'diff-index with --binary' \
 
 # Try removal (b), modification (d), and creation (e).
 test_expect_success 'diff-index with --binary' \


@@ -72,7 +72,7 @@ test_expect_success 'diff-index with --binary' \
         git apply --stat --summary current'
 
 test_expect_success 'apply binary patch' \
         git apply --stat --summary current'
 
 test_expect_success 'apply binary patch' \

-       'git-reset --hard &&
+       'git reset --hard &&

         git apply --binary --index <current &&
         tree1=`git write-tree` &&
         test "$tree1" = "$tree0"'
         git apply --binary --index <current &&
         tree1=`git write-tree` &&
         test "$tree1" = "$tree0"'

diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index 7da0b4bb8bfa96765b9f6eaa1693e2e24e82d335..ad4cc1a7576d41131d291426d80c329ff838aa26 100755 (executable)
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -21,16 +21,16 @@ cat file1 >file2
 cat file1 >file4
 
 git update-index --add --remove file1 file2 file4
 cat file1 >file4
 
 git update-index --add --remove file1 file2 file4

-git-commit -m 'Initial Version' 2>/dev/null
+git commit -m 'Initial Version' 2>/dev/null

 
 

-git-checkout -b binary
+git checkout -b binary

 perl -pe 'y/x/\000/' <file1 >file3
 cat file3 >file4
 git add file2
 perl -pe 'y/\000/v/' <file3 >file1
 rm -f file2
 git update-index --add --remove file1 file2 file3 file4
 perl -pe 'y/x/\000/' <file1 >file3
 cat file3 >file4
 git add file2
 perl -pe 'y/\000/v/' <file3 >file1
 rm -f file2
 git update-index --add --remove file1 file2 file3 file4

-git-commit -m 'Second Version'
+git commit -m 'Second Version'

 
 git diff-tree -p master binary >B.diff
 git diff-tree -p -C master binary >C.diff
 
 git diff-tree -p master binary >B.diff
 git diff-tree -p -C master binary >C.diff


@@ -39,47 +39,47 @@ git diff-tree -p --binary master binary >BF.diff
 git diff-tree -p --binary -C master binary >CF.diff
 
 test_expect_success 'stat binary diff -- should not fail.' \
 git diff-tree -p --binary -C master binary >CF.diff
 
 test_expect_success 'stat binary diff -- should not fail.' \

-       'git-checkout master
+       'git checkout master

         git apply --stat --summary B.diff'
 
 test_expect_success 'stat binary diff (copy) -- should not fail.' \
         git apply --stat --summary B.diff'
 
 test_expect_success 'stat binary diff (copy) -- should not fail.' \

-       'git-checkout master
+       'git checkout master

         git apply --stat --summary C.diff'
 
 test_expect_success 'check binary diff -- should fail.' \
         git apply --stat --summary C.diff'
 
 test_expect_success 'check binary diff -- should fail.' \

-       'git-checkout master &&
+       'git checkout master &&

         test_must_fail git apply --check B.diff'
 
 test_expect_success 'check binary diff (copy) -- should fail.' \
         test_must_fail git apply --check B.diff'
 
 test_expect_success 'check binary diff (copy) -- should fail.' \

-       'git-checkout master &&
+       'git checkout master &&

         test_must_fail git apply --check C.diff'
 
 test_expect_success \
        'check incomplete binary diff with replacement -- should fail.' '
         test_must_fail git apply --check C.diff'
 
 test_expect_success \
        'check incomplete binary diff with replacement -- should fail.' '

-       git-checkout master &&
+       git checkout master &&

        test_must_fail git apply --check --allow-binary-replacement B.diff
 '
 
 test_expect_success \
     'check incomplete binary diff with replacement (copy) -- should fail.' '
        test_must_fail git apply --check --allow-binary-replacement B.diff
 '
 
 test_expect_success \
     'check incomplete binary diff with replacement (copy) -- should fail.' '

-        git-checkout master &&
+        git checkout master &&

         test_must_fail git apply --check --allow-binary-replacement C.diff
 '
 
 test_expect_success 'check binary diff with replacement.' \
         test_must_fail git apply --check --allow-binary-replacement C.diff
 '
 
 test_expect_success 'check binary diff with replacement.' \

-       'git-checkout master
+       'git checkout master

         git apply --check --allow-binary-replacement BF.diff'
 
 test_expect_success 'check binary diff with replacement (copy).' \
         git apply --check --allow-binary-replacement BF.diff'
 
 test_expect_success 'check binary diff with replacement (copy).' \

-       'git-checkout master
+       'git checkout master

         git apply --check --allow-binary-replacement CF.diff'
 
 # Now we start applying them.
 
 do_reset () {
        rm -f file? &&
         git apply --check --allow-binary-replacement CF.diff'
 
 # Now we start applying them.
 
 do_reset () {
        rm -f file? &&

-       git-reset --hard &&
-       git-checkout -f master
+       git reset --hard &&
+       git checkout -f master

 }
 
 test_expect_success 'apply binary diff -- should fail.' \
 }
 
 test_expect_success 'apply binary diff -- should fail.' \

diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index 85f3da2b98a881647837323e3af0378ce59a9db5..f83322e513b96bb90e71ce39340515c6be0db186 100755 (executable)
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='core.whitespace rules and git-apply'
+test_description='core.whitespace rules and git apply'

 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

diff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh
index 1f859dd908cb298bf89a13822e8fc19882060689..3a8202ea9311b1c90158ad0d115dda985060fdeb 100755 (executable)
--- a/t/t4127-apply-same-fn.sh
+++ b/t/t4127-apply-same-fn.sh
@@ -26,7 +26,7 @@ test_expect_success 'apply same filename with independent changes' '
        git diff >> patch0 &&
        cp same_fn same_fn2 &&
        git reset --hard &&
        git diff >> patch0 &&
        cp same_fn same_fn2 &&
        git reset --hard &&

-       git-apply patch0 &&
+       git apply patch0 &&

        diff same_fn same_fn2
 '
 
        diff same_fn same_fn2
 '
 


@@ -39,7 +39,7 @@ test_expect_success 'apply same filename with overlapping changes' '
        git diff >> patch0 &&
        cp same_fn same_fn2 &&
        git reset --hard &&
        git diff >> patch0 &&
        cp same_fn same_fn2 &&
        git reset --hard &&

-       git-apply patch0 &&
+       git apply patch0 &&

        diff same_fn same_fn2
 '
 
        diff same_fn same_fn2
 '
 

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 6e6aaf59364456e21bb1deda960edb5295a71131..1be5fb3f9dfab6d4fcd79f65de6b85ae05f373cd 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -164,7 +164,7 @@ test_expect_success 'am --keep really keeps the subject' '
        git checkout HEAD^ &&
        git am --keep patch4 &&
        ! test -d .git/rebase-apply &&
        git checkout HEAD^ &&
        git am --keep patch4 &&
        ! test -d .git/rebase-apply &&

-       git-cat-file commit HEAD |
+       git cat-file commit HEAD |

                grep -q -F "Re: Re: Re: [PATCH 1/5 v2] third"
 '
 
                grep -q -F "Re: Re: Re: [PATCH 1/5 v2] third"
 '
 

diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 7d86cdff64522f588a3d3e781cf2b272087cfd88..4448aba7e0727b70a4e525e57ad21cd7e226c1f8 100755 (executable)
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -44,14 +44,14 @@ do
        '
 
        test_expect_success "am$with3 --skip continue after failed am$with3" '
        '
 
        test_expect_success "am$with3 --skip continue after failed am$with3" '

-               test_must_fail git-am$with3 --skip >output &&
+               test_must_fail git am$with3 --skip >output &&

                test "$(grep "^Applying" output)" = "Applying: 6" &&
                test_cmp file-2-expect file-2 &&
                test ! -f .git/rr-cache/MERGE_RR
        '
 
        test_expect_success "am --abort goes back after failed am$with3" '
                test "$(grep "^Applying" output)" = "Applying: 6" &&
                test_cmp file-2-expect file-2 &&
                test ! -f .git/rr-cache/MERGE_RR
        '
 
        test_expect_success "am --abort goes back after failed am$with3" '

-               git-am --abort &&
+               git am --abort &&

                git rev-parse HEAD >actual &&
                git rev-parse initial >expect &&
                test_cmp expect actual &&
                git rev-parse HEAD >actual &&
                git rev-parse initial >expect &&
                test_cmp expect actual &&

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 645583f9d729cb04ea7bd9638b0c49c48128822e..482bc7ae6842ccf082f05f65c691d001cad2b148 100755 (executable)
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
 # Copyright (c) 2005 Junio C Hamano
 #
 

-test_description='git-pack-object
+test_description='git pack-object

 
 '
 . ./test-lib.sh
 
 '
 . ./test-lib.sh


@@ -236,24 +236,24 @@ test_expect_success \
 test_expect_success \
     'build pack index for an existing pack' \
     'cat test-1-${packname_1}.pack >test-3.pack &&
 test_expect_success \
     'build pack index for an existing pack' \
     'cat test-1-${packname_1}.pack >test-3.pack &&

-     git-index-pack -o tmp.idx test-3.pack &&
+     git index-pack -o tmp.idx test-3.pack &&

      cmp tmp.idx test-1-${packname_1}.idx &&
 
      cmp tmp.idx test-1-${packname_1}.idx &&
 

-     git-index-pack test-3.pack &&
+     git index-pack test-3.pack &&

      cmp test-3.idx test-1-${packname_1}.idx &&
 
      cat test-2-${packname_2}.pack >test-3.pack &&
      cmp test-3.idx test-1-${packname_1}.idx &&
 
      cat test-2-${packname_2}.pack >test-3.pack &&

-     git-index-pack -o tmp.idx test-2-${packname_2}.pack &&
+     git index-pack -o tmp.idx test-2-${packname_2}.pack &&

      cmp tmp.idx test-2-${packname_2}.idx &&
 
      cmp tmp.idx test-2-${packname_2}.idx &&
 

-     git-index-pack test-3.pack &&
+     git index-pack test-3.pack &&

      cmp test-3.idx test-2-${packname_2}.idx &&
 
      cat test-3-${packname_3}.pack >test-3.pack &&
      cmp test-3.idx test-2-${packname_2}.idx &&
 
      cat test-3-${packname_3}.pack >test-3.pack &&

-     git-index-pack -o tmp.idx test-3-${packname_3}.pack &&
+     git index-pack -o tmp.idx test-3-${packname_3}.pack &&

      cmp tmp.idx test-3-${packname_3}.idx &&
 
      cmp tmp.idx test-3-${packname_3}.idx &&
 

-     git-index-pack test-3.pack &&
+     git index-pack test-3.pack &&

      cmp test-3.idx test-3-${packname_3}.idx &&
 
      :'
      cmp test-3.idx test-3-${packname_3}.idx &&
 
      :'


@@ -266,7 +266,7 @@ test_expect_success \
 
 test_expect_success \
     'make sure index-pack detects the SHA1 collision' \
 
 test_expect_success \
     'make sure index-pack detects the SHA1 collision' \

-    'test_must_fail git-index-pack -o bad.idx test-3.pack'
+    'test_must_fail git index-pack -o bad.idx test-3.pack'

 
 test_expect_success \
     'honor pack.packSizeLimit' \
 
 test_expect_success \
     'honor pack.packSizeLimit' \

diff --git a/t/t5301-sliding-window.sh b/t/t5301-sliding-window.sh
index 073ac0c6f9dd3d06474b1b81c8c7b622dcfee663..0a24e61ff942ee91dfb25fe490330a0272480ac2 100755 (executable)
--- a/t/t5301-sliding-window.sh
+++ b/t/t5301-sliding-window.sh
@@ -19,7 +19,7 @@ test_expect_success \
      tree=`git write-tree` &&
      commit1=`git commit-tree $tree </dev/null` &&
      git update-ref HEAD $commit1 &&
      tree=`git write-tree` &&
      commit1=`git commit-tree $tree </dev/null` &&
      git update-ref HEAD $commit1 &&

-     git-repack -a -d &&
+     git repack -a -d &&

      test "`git count-objects`" = "0 objects, 0 kilobytes" &&
      pack1=`ls .git/objects/pack/*.pack` &&
      test -f "$pack1"'
      test "`git count-objects`" = "0 objects, 0 kilobytes" &&
      pack1=`ls .git/objects/pack/*.pack` &&
      test -f "$pack1"'


@@ -45,7 +45,7 @@ test_expect_success \
      git config core.packedGitLimit 512 &&
      commit2=`git commit-tree $tree -p $commit1 </dev/null` &&
      git update-ref HEAD $commit2 &&
      git config core.packedGitLimit 512 &&
      commit2=`git commit-tree $tree -p $commit1 </dev/null` &&
      git update-ref HEAD $commit2 &&

-     git-repack -a -d &&
+     git repack -a -d &&

      test "`git count-objects`" = "0 objects, 0 kilobytes" &&
      pack2=`ls .git/objects/pack/*.pack` &&
      test -f "$pack2"
      test "`git count-objects`" = "0 objects, 0 kilobytes" &&
      pack2=`ls .git/objects/pack/*.pack` &&
      test -f "$pack2"

diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index 0639772ac4e1e2c6563e793b16c2c10faf06758a..6424db1f28e11c3ac6eb629ba4db7380812eab72 100755 (executable)
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -48,11 +48,11 @@ test_expect_success \
 
 test_expect_success \
     'index-pack with index version 1' \
 
 test_expect_success \
     'index-pack with index version 1' \

-    'git-index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"'
+    'git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"'

 
 test_expect_success \
     'index-pack with index version 2' \
 
 test_expect_success \
     'index-pack with index version 2' \

-    'git-index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"'
+    'git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"'

 
 test_expect_success \
     'index-pack results should match pack-objects ones' \
 
 test_expect_success \
     'index-pack results should match pack-objects ones' \


@@ -85,7 +85,7 @@ test_expect_success \
 test "$have_64bits" &&
 test_expect_success \
     'index v2: force some 64-bit offsets with index-pack' \
 test "$have_64bits" &&
 test_expect_success \
     'index v2: force some 64-bit offsets with index-pack' \

-    'git-index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack"'
+    'git index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack"'

 
 test "$have_64bits" &&
 test_expect_success \
 
 test "$have_64bits" &&
 test_expect_success \


@@ -94,7 +94,7 @@ test_expect_success \
 
 test_expect_success \
     '[index v1] 1) stream pack to repository' \
 
 test_expect_success \
     '[index v1] 1) stream pack to repository' \

-    'git-index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" &&
+    'git index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" &&

      git prune-packed &&
      git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
      cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
      git prune-packed &&
      git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
      cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&


@@ -132,7 +132,7 @@ test_expect_success \
 test_expect_success \
     '[index v2] 1) stream pack to repository' \
     'rm -f .git/objects/pack/* &&
 test_expect_success \
     '[index v2] 1) stream pack to repository' \
     'rm -f .git/objects/pack/* &&

-     git-index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
+     git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&

      git prune-packed &&
      git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
      cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
      git prune-packed &&
      git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
      cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&


@@ -165,7 +165,7 @@ test_expect_success \
 test_expect_success \
     '[index v2] 6) verify-pack detects CRC mismatch' \
     'rm -f .git/objects/pack/* &&
 test_expect_success \
     '[index v2] 6) verify-pack detects CRC mismatch' \
     'rm -f .git/objects/pack/* &&

-     git-index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
+     git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&

      git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
      chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
      dd if=/dev/zero of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
      git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
      chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
      dd if=/dev/zero of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \

diff --git a/t/t5305-include-tag.sh b/t/t5305-include-tag.sh
index fb471a08c698b431cd2440e9d4f0e77e2fef6b08..b061864a8743636ae7759ff4e8ff2694410617a1 100755 (executable)
--- a/t/t5305-include-tag.sh
+++ b/t/t5305-include-tag.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-pack-object --include-tag'
+test_description='git pack-object --include-tag'

 . ./test-lib.sh
 
 TRASH=`pwd`
 . ./test-lib.sh
 
 TRASH=`pwd`

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 68c2ae688c2b7ff96ec927622f92fd512e7beefe..544771d8fa98ec70d84e5083c2bfc0ebdf45f9a1 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -31,7 +31,7 @@ test_expect_success setup '
            parent=$commit || return 1
        done &&
        git update-ref HEAD "$commit" &&
            parent=$commit || return 1
        done &&
        git update-ref HEAD "$commit" &&

-       git-clone ./. victim &&
+       git clone ./. victim &&

        cd victim &&
        git log &&
        cd .. &&
        cd victim &&
        git log &&
        cd .. &&


@@ -68,7 +68,7 @@ test_expect_success 'pack the destination repository' '
 test_expect_success \
         'pushing rewound head should not barf but require --force' '
        # should not fail but refuse to update.
 test_expect_success \
         'pushing rewound head should not barf but require --force' '
        # should not fail but refuse to update.

-       if git-send-pack ./victim/.git/ master
+       if git send-pack ./victim/.git/ master

        then
                # now it should fail with Pasky patch
                echo >&2 Gaah, it should have failed.
        then
                # now it should fail with Pasky patch
                echo >&2 Gaah, it should have failed.


@@ -85,7 +85,7 @@ test_expect_success \
                true
        fi &&
        # this should update
                true
        fi &&
        # this should update

-       git-send-pack --force ./victim/.git/ master &&
+       git send-pack --force ./victim/.git/ master &&

        cmp victim/.git/refs/heads/master .git/refs/heads/master
 '
 
        cmp victim/.git/refs/heads/master .git/refs/heads/master
 '
 


@@ -95,7 +95,7 @@ test_expect_success \
        git branch extra master &&
        cd .. &&
        test -f victim/.git/refs/heads/extra &&
        git branch extra master &&
        cd .. &&
        test -f victim/.git/refs/heads/extra &&

-       git-send-pack ./victim/.git/ :extra master &&
+       git send-pack ./victim/.git/ :extra master &&

        ! test -f victim/.git/refs/heads/extra
 '
 
        ! test -f victim/.git/refs/heads/extra
 '
 


@@ -109,27 +109,27 @@ test_expect_success \
        git config receive.denyNonFastforwards true &&
        cd .. &&
        git update-ref refs/heads/master master^ || return 1
        git config receive.denyNonFastforwards true &&
        cd .. &&
        git update-ref refs/heads/master master^ || return 1

-       git-send-pack --force ./victim/.git/ master && return 1
+       git send-pack --force ./victim/.git/ master && return 1

        ! test_cmp .git/refs/heads/master victim/.git/refs/heads/master
 '
 
 test_expect_success \
        'pushing does not include non-head refs' '
        mkdir parent && cd parent &&
        ! test_cmp .git/refs/heads/master victim/.git/refs/heads/master
 '
 
 test_expect_success \
        'pushing does not include non-head refs' '
        mkdir parent && cd parent &&

-       git-init && touch file && git-add file && git-commit -m add &&
+       git init && touch file && git add file && git commit -m add &&

        cd .. &&
        cd .. &&

-       git-clone parent child && cd child && git-push --all &&
+       git clone parent child && cd child && git push --all &&

        cd ../parent &&
        cd ../parent &&

-       git-branch -a >branches && ! grep origin/master branches
+       git branch -a >branches && ! grep origin/master branches

 '
 
 rewound_push_setup() {
        rm -rf parent child &&
        mkdir parent && cd parent &&
 '
 
 rewound_push_setup() {
        rm -rf parent child &&
        mkdir parent && cd parent &&

-       git-init && echo one >file && git-add file && git-commit -m one &&
-       echo two >file && git-commit -a -m two &&
+       git init && echo one >file && git add file && git commit -m one &&
+       echo two >file && git commit -a -m two &&

        cd .. &&
        cd .. &&

-       git-clone parent child && cd child && git-reset --hard HEAD^
+       git clone parent child && cd child && git reset --hard HEAD^

 }
 
 rewound_push_succeeded() {
 }
 
 rewound_push_succeeded() {


@@ -148,26 +148,26 @@ rewound_push_failed() {
 test_expect_success \
        'pushing explicit refspecs respects forcing' '
        rewound_push_setup &&
 test_expect_success \
        'pushing explicit refspecs respects forcing' '
        rewound_push_setup &&

-       if git-send-pack ../parent/.git refs/heads/master:refs/heads/master
+       if git send-pack ../parent/.git refs/heads/master:refs/heads/master

        then
                false
        else
                true
        fi && rewound_push_failed &&
        then
                false
        else
                true
        fi && rewound_push_failed &&

-       git-send-pack ../parent/.git +refs/heads/master:refs/heads/master &&
+       git send-pack ../parent/.git +refs/heads/master:refs/heads/master &&

        rewound_push_succeeded
 '
 
 test_expect_success \
        'pushing wildcard refspecs respects forcing' '
        rewound_push_setup &&
        rewound_push_succeeded
 '
 
 test_expect_success \
        'pushing wildcard refspecs respects forcing' '
        rewound_push_setup &&

-       if git-send-pack ../parent/.git refs/heads/*:refs/heads/*
+       if git send-pack ../parent/.git refs/heads/*:refs/heads/*

        then
                false
        else
                true
        fi && rewound_push_failed &&
        then
                false
        else
                true
        fi && rewound_push_failed &&

-       git-send-pack ../parent/.git +refs/heads/*:refs/heads/* &&
+       git send-pack ../parent/.git +refs/heads/*:refs/heads/* &&

        rewound_push_succeeded
 '
 
        rewound_push_succeeded
 '
 

diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
index ee769d6695ee91120671c485924d804f14c80424..64f66c94f36538b1c7d20045fc4233aa0b9d9a0d 100755 (executable)
--- a/t/t5401-update-hooks.sh
+++ b/t/t5401-update-hooks.sh
@@ -17,7 +17,7 @@ test_expect_success setup '
        commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
        git update-ref refs/heads/master $commit0 &&
        git update-ref refs/heads/tofail $commit1 &&
        commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
        git update-ref refs/heads/master $commit0 &&
        git update-ref refs/heads/tofail $commit1 &&

-       git-clone ./. victim &&
+       git clone ./. victim &&

        GIT_DIR=victim/.git git update-ref refs/heads/tofail $commit1 &&
        git update-ref refs/heads/master $commit1 &&
        git update-ref refs/heads/tofail $commit0
        GIT_DIR=victim/.git git update-ref refs/heads/tofail $commit1 &&
        git update-ref refs/heads/master $commit1 &&
        git update-ref refs/heads/tofail $commit0


@@ -61,7 +61,7 @@ EOF
 chmod u+x victim/.git/hooks/post-update
 
 test_expect_success push '
 chmod u+x victim/.git/hooks/post-update
 
 test_expect_success push '

-       test_must_fail git-send-pack --force ./victim/.git \
+       test_must_fail git send-pack --force ./victim/.git \

                master tofail >send.out 2>send.err
 '
 
                master tofail >send.out 2>send.err
 '
 

diff --git a/t/t5402-post-merge-hook.sh b/t/t5402-post-merge-hook.sh
index 1394047a8dc3e87476e223db42936d59845f803b..6eb2ffd6ecabb9125d06e76a17d0821d7e907dfd 100755 (executable)
--- a/t/t5402-post-merge-hook.sh
+++ b/t/t5402-post-merge-hook.sh
@@ -16,9 +16,9 @@ test_expect_success setup '
        tree1=$(git write-tree) &&
        commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
         git update-ref refs/heads/master $commit0 &&
        tree1=$(git write-tree) &&
        commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
         git update-ref refs/heads/master $commit0 &&

-       git-clone ./. clone1 &&
+       git clone ./. clone1 &&

        GIT_DIR=clone1/.git git update-index --add a &&
        GIT_DIR=clone1/.git git update-index --add a &&

-       git-clone ./. clone2 &&
+       git clone ./. clone2 &&

        GIT_DIR=clone2/.git git update-index --add a
 '
 
        GIT_DIR=clone2/.git git update-index --add a
 '
 

diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index 823239a251f9ba9607649382d595db1b6cc6dcb2..9b2e1a94c5fb5aa094853a169cbdf2f7dc56e152 100755 (executable)
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -14,8 +14,8 @@ test_expect_success setup '
         tree0=$(git write-tree) &&
         commit0=$(echo setup | git commit-tree $tree0) &&
         git update-ref refs/heads/master $commit0 &&
         tree0=$(git write-tree) &&
         commit0=$(echo setup | git commit-tree $tree0) &&
         git update-ref refs/heads/master $commit0 &&

-        git-clone ./. clone1 &&
-        git-clone ./. clone2 &&
+        git clone ./. clone1 &&
+        git clone ./. clone2 &&

         GIT_DIR=clone2/.git git branch -a new2 &&
         echo Data for commit1. >clone2/b &&
         GIT_DIR=clone2/.git git add clone2/b &&
         GIT_DIR=clone2/.git git branch -a new2 &&
         echo Data for commit1. >clone2/b &&
         GIT_DIR=clone2/.git git add clone2/b &&

diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 362cf7e928090fb3752936317f78a4d128810127..448ec7156585a22f61943041dd8381f2cb7ec5d1 100755 (executable)
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -58,7 +58,7 @@ pull_to_client () {
 
        cd client
        test_expect_success "$number pull" \
 
        cd client
        test_expect_success "$number pull" \

-               "git-fetch-pack -k -v .. $heads"
+               "git fetch-pack -k -v .. $heads"

        case "$heads" in *A*) echo $ATIP > .git/refs/heads/A;; esac
        case "$heads" in *B*) echo $BTIP > .git/refs/heads/B;; esac
        git symbolic-ref HEAD refs/heads/`echo $heads | sed -e 's/^\(.\).*$/\1/'`
        case "$heads" in *A*) echo $ATIP > .git/refs/heads/A;; esac
        case "$heads" in *B*) echo $BTIP > .git/refs/heads/B;; esac
        git symbolic-ref HEAD refs/heads/`echo $heads | sed -e 's/^\(.\).*$/\1/'`


@@ -129,7 +129,7 @@ pull_to_client 2nd "B" $((64*3))
 
 pull_to_client 3rd "A" $((1*3)) # old fails
 
 
 pull_to_client 3rd "A" $((1*3)) # old fails
 

-test_expect_success "clone shallow" 'git-clone --depth 2 "file://$(pwd)/." shallow'
+test_expect_success "clone shallow" 'git clone --depth 2 "file://$(pwd)/." shallow'

 
 (cd shallow; git count-objects -v) > count.shallow
 
 
 (cd shallow; git count-objects -v) > count.shallow
 

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 13d1d826c20293c26c739c70c0a36ed48bbb41d1..de26c203270522983f9ffae4e0bde64a61898567 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -111,7 +111,7 @@ test_expect_success 'fetch must not resolve short tag name' '
 test_expect_success 'fetch must not resolve short remote name' '
 
        cd "$D" &&
 test_expect_success 'fetch must not resolve short remote name' '
 
        cd "$D" &&

-       git-update-ref refs/remotes/six/HEAD HEAD
+       git update-ref refs/remotes/six/HEAD HEAD

 
        mkdir six &&
        cd six &&
 
        mkdir six &&
        cd six &&

diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh
index 1a15817cd5f8e838812723ad14dbec59a108680c..f5102b902a4fa0505fee13aa18d38a211cdb42cb 100755 (executable)
--- a/t/t5530-upload-pack-error.sh
+++ b/t/t5530-upload-pack-error.sh
@@ -34,7 +34,7 @@ test_expect_success 'upload-pack fails due to error in pack-objects' '
 
        ! echo "0032want $(git rev-parse HEAD)
 00000009done
 
        ! echo "0032want $(git rev-parse HEAD)
 00000009done

-0000" | git-upload-pack . > /dev/null 2> output.err &&
+0000" | git upload-pack . > /dev/null 2> output.err &&

        grep "pack-objects died" output.err
 '
 
        grep "pack-objects died" output.err
 '
 


@@ -52,7 +52,7 @@ test_expect_success 'upload-pack fails due to error in rev-list' '
 
        ! echo "0032want $(git rev-parse HEAD)
 00000009done
 
        ! echo "0032want $(git rev-parse HEAD)
 00000009done

-0000" | git-upload-pack . > /dev/null 2> output.err &&
+0000" | git upload-pack . > /dev/null 2> output.err &&

        grep "waitpid (async) failed" output.err
 '
 
        grep "waitpid (async) failed" output.err
 '
 

diff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh
index 3c013e2b6aa5c659c80134baf43c99e0d89e2e38..ee06d2864949de71b000402fda4378c9b483fe72 100755 (executable)
--- a/t/t5600-clone-fail-cleanup.sh
+++ b/t/t5600-clone-fail-cleanup.sh
@@ -3,9 +3,9 @@
 # Copyright (C) 2006 Carl D. Worth <cworth@cworth.org>
 #
 
 # Copyright (C) 2006 Carl D. Worth <cworth@cworth.org>
 #
 

-test_description='test git-clone to cleanup after failure
+test_description='test git clone to cleanup after failure

 
 

-This test covers the fact that if git-clone fails, it should remove
+This test covers the fact that if git clone fails, it should remove

 the directory it created, to avoid the user having to manually
 remove the directory before attempting a clone again.'
 
 the directory it created, to avoid the user having to manually
 remove the directory before attempting a clone again.'
 


@@ -13,7 +13,7 @@ remove the directory before attempting a clone again.'
 
 test_expect_success \
     'clone of non-existent source should fail' \
 
 test_expect_success \
     'clone of non-existent source should fail' \

-    'test_must_fail git-clone foo bar'
+    'test_must_fail git clone foo bar'

 
 test_expect_success \
     'failed clone should not leave a directory' \
 
 test_expect_success \
     'failed clone should not leave a directory' \


@@ -25,15 +25,15 @@ test_create_repo foo
 # clone doesn't like it if there is no HEAD. Is that a bug?
 (cd foo && touch file && git add file && git commit -m 'add file' >/dev/null 2>&1)
 
 # clone doesn't like it if there is no HEAD. Is that a bug?
 (cd foo && touch file && git add file && git commit -m 'add file' >/dev/null 2>&1)
 

-# source repository given to git-clone should be relative to the
+# source repository given to git clone should be relative to the

 # current path not to the target dir
 test_expect_success \
     'clone of non-existent (relative to $PWD) source should fail' \
 # current path not to the target dir
 test_expect_success \
     'clone of non-existent (relative to $PWD) source should fail' \

-    'test_must_fail git-clone ../foo baz'
+    'test_must_fail git clone ../foo baz'

 
 test_expect_success \
     'clone should work now that source exists' \
 
 test_expect_success \
     'clone should work now that source exists' \

-    'git-clone foo bar'
+    'git clone foo bar'

 
 test_expect_success \
     'successful clone must leave the directory' \
 
 test_expect_success \
     'successful clone must leave the directory' \

diff --git a/t/t5602-clone-remote-exec.sh b/t/t5602-clone-remote-exec.sh
index 8367a6845f6ea3cdbc2f4f0e096144975fa3aef2..82b1d1e2b3f6704cf08540f0e6f4cecf0981cb7d 100755 (executable)
--- a/t/t5602-clone-remote-exec.sh
+++ b/t/t5602-clone-remote-exec.sh
@@ -11,13 +11,13 @@ test_expect_success setup '
        chmod +x not_ssh
 '
 
        chmod +x not_ssh
 '
 

-test_expect_success 'clone calls git-upload-pack unqualified with no -u option' '
+test_expect_success 'clone calls git upload-pack unqualified with no -u option' '

        GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk
        echo "localhost git-upload-pack '\''/path/to/repo'\''" >expected
        test_cmp expected not_ssh_output
 '
 
        GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk
        echo "localhost git-upload-pack '\''/path/to/repo'\''" >expected
        test_cmp expected not_ssh_output
 '
 

-test_expect_success 'clone calls specified git-upload-pack with -u option' '
+test_expect_success 'clone calls specified git upload-pack with -u option' '

        GIT_SSH=./not_ssh git clone -u /something/bin/git-upload-pack localhost:/path/to/repo junk
        echo "localhost /something/bin/git-upload-pack '\''/path/to/repo'\''" >expected
        test_cmp expected not_ssh_output
        GIT_SSH=./not_ssh git clone -u /something/bin/git-upload-pack localhost:/path/to/repo junk
        echo "localhost /something/bin/git-upload-pack '\''/path/to/repo'\''" >expected
        test_cmp expected not_ssh_output

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 485ad4d44a6b9714c1986d6cff9c02263e1eb0f1..86bf7e14ba5bb9a76ef00cb5a3564e326f674a18 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -6,8 +6,8 @@ test_description='git rev-list --pretty=format test'
 
 test_tick
 test_expect_success 'setup' '
 
 test_tick
 test_expect_success 'setup' '

-touch foo && git add foo && git-commit -m "added foo" &&
-  echo changed >foo && git-commit -a -m "changed foo"
+touch foo && git add foo && git commit -m "added foo" &&
+  echo changed >foo && git commit -a -m "changed foo"

 '
 
 # usage: test_format name format_string <expected_output
 '
 
 # usage: test_format name format_string <expected_output


@@ -110,7 +110,7 @@ include an iso8859 character: ¡bueno!
 EOF
 test_expect_success 'setup complex body' '
 git config i18n.commitencoding iso8859-1 &&
 EOF
 test_expect_success 'setup complex body' '
 git config i18n.commitencoding iso8859-1 &&

-  echo change2 >foo && git-commit -a -F commit-msg
+  echo change2 >foo && git commit -a -F commit-msg

 '
 
 test_format complex-encoding %e <<'EOF'
 '
 
 test_format complex-encoding %e <<'EOF'

diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh
index fc58456a11eef7ecb4cf60d37a9e9d5cbe13f970..53892a555ce2e4a51db15066771f217a135e15e9 100755 (executable)
--- a/t/t6025-merge-symlinks.sh
+++ b/t/t6025-merge-symlinks.sh
@@ -5,7 +5,7 @@
 
 test_description='merging symlinks on filesystem w/o symlink support.
 
 
 test_description='merging symlinks on filesystem w/o symlink support.
 

-This tests that git-merge-recursive writes merge results as plain files
+This tests that git merge-recursive writes merge results as plain files

 if core.symlinks is false.'
 
 . ./test-lib.sh
 if core.symlinks is false.'
 
 . ./test-lib.sh


@@ -15,25 +15,25 @@ test_expect_success \
 git config core.symlinks false &&
 > file &&
 git add file &&
 git config core.symlinks false &&
 > file &&
 git add file &&

-git-commit -m initial &&
+git commit -m initial &&

 git branch b-symlink &&
 git branch b-file &&
 git branch b-symlink &&
 git branch b-file &&

-l=$(echo -n file | git-hash-object -t blob -w --stdin) &&
+l=$(echo -n file | git hash-object -t blob -w --stdin) &&

 echo "120000 $l        symlink" | git update-index --index-info &&
 echo "120000 $l        symlink" | git update-index --index-info &&

-git-commit -m master &&
-git-checkout b-symlink &&
-l=$(echo -n file-different | git-hash-object -t blob -w --stdin) &&
+git commit -m master &&
+git checkout b-symlink &&
+l=$(echo -n file-different | git hash-object -t blob -w --stdin) &&

 echo "120000 $l        symlink" | git update-index --index-info &&
 echo "120000 $l        symlink" | git update-index --index-info &&

-git-commit -m b-symlink &&
-git-checkout b-file &&
+git commit -m b-symlink &&
+git checkout b-file &&

 echo plain-file > symlink &&
 git add symlink &&
 echo plain-file > symlink &&
 git add symlink &&

-git-commit -m b-file'
+git commit -m b-file'

 
 test_expect_success \
 'merge master into b-symlink, which has a different symbolic link' '
 
 test_expect_success \
 'merge master into b-symlink, which has a different symbolic link' '

-git-checkout b-symlink &&
-test_must_fail git-merge master'
+git checkout b-symlink &&
+test_must_fail git merge master'

 
 test_expect_success \
 'the merge result must be a file' '
 
 test_expect_success \
 'the merge result must be a file' '


@@ -41,8 +41,8 @@ test -f symlink'
 
 test_expect_success \
 'merge master into b-file, which has a file instead of a symbolic link' '
 
 test_expect_success \
 'merge master into b-file, which has a file instead of a symbolic link' '

-git-reset --hard && git-checkout b-file &&
-test_must_fail git-merge master'
+git reset --hard && git checkout b-file &&
+test_must_fail git merge master'

 
 test_expect_success \
 'the merge result must be a file' '
 
 test_expect_success \
 'the merge result must be a file' '


@@ -50,9 +50,9 @@ test -f symlink'
 
 test_expect_success \
 'merge b-file, which has a file instead of a symbolic link, into master' '
 
 test_expect_success \
 'merge b-file, which has a file instead of a symbolic link, into master' '

-git-reset --hard &&
-git-checkout master &&
-test_must_fail git-merge b-file'
+git reset --hard &&
+git checkout master &&
+test_must_fail git merge b-file'

 
 test_expect_success \
 'the merge result must be a file' '
 
 test_expect_success \
 'the merge result must be a file' '

diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 56fc34176859b81137b4d88af90398b9a74a18f7..4b423e937dbd259e5b2311051907a54309e0edb9 100755 (executable)
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
@@ -106,9 +106,9 @@ test_expect_success 'custom merge backend' '
 
        cmp binary union &&
        sed -e 1,3d text >check-1 &&
 
        cmp binary union &&
        sed -e 1,3d text >check-1 &&

-       o=$(git-unpack-file master^:text) &&
-       a=$(git-unpack-file side^:text) &&
-       b=$(git-unpack-file master:text) &&
+       o=$(git unpack-file master^:text) &&
+       a=$(git unpack-file side^:text) &&
+       b=$(git unpack-file master:text) &&

        sh -c "./custom-merge $o $a $b 0" &&
        sed -e 1,3d $a >check-2 &&
        cmp check-1 check-2 &&
        sh -c "./custom-merge $o $a $b 0" &&
        sed -e 1,3d $a >check-2 &&
        cmp check-1 check-2 &&


@@ -133,9 +133,9 @@ test_expect_success 'custom merge backend' '
 
        cmp binary union &&
        sed -e 1,3d text >check-1 &&
 
        cmp binary union &&
        sed -e 1,3d text >check-1 &&

-       o=$(git-unpack-file master^:text) &&
-       a=$(git-unpack-file anchor:text) &&
-       b=$(git-unpack-file master:text) &&
+       o=$(git unpack-file master^:text) &&
+       a=$(git unpack-file anchor:text) &&
+       b=$(git unpack-file master:text) &&

        sh -c "./custom-merge $o $a $b 0" &&
        sed -e 1,3d $a >check-2 &&
        cmp check-1 check-2 &&
        sh -c "./custom-merge $o $a $b 0" &&
        sed -e 1,3d $a >check-2 &&
        cmp check-1 check-2 &&

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 244fda62a5cd34d778cf0789961654eaa37fe589..36c9a6965f2b200f712ae5a6ae008ca1ef5007a0 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2007 Christian Couder
 #
 #
 # Copyright (c) 2007 Christian Couder
 #

-test_description='Tests git-bisect functionality'
+test_description='Tests git bisect functionality'

 
 exec </dev/null
 
 
 exec </dev/null
 


@@ -23,7 +23,7 @@ add_line_into_file()
     fi
 
     test_tick
     fi
 
     test_tick

-    git-commit --quiet -m "$MSG" $_file
+    git commit --quiet -m "$MSG" $_file

 }
 
 HASH1=
 }
 
 HASH1=

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 2fb672c3b43a9efe4cb9c85465f6b33f23724e48..16cc63581383360d6dc92a69f646890eb00e580a 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -31,57 +31,57 @@ check_describe () {
 test_expect_success setup '
 
        test_tick &&
 test_expect_success setup '
 
        test_tick &&

-       echo one >file && git add file && git-commit -m initial &&
+       echo one >file && git add file && git commit -m initial &&

        one=$(git rev-parse HEAD) &&
 
        test_tick &&
        one=$(git rev-parse HEAD) &&
 
        test_tick &&

-       echo two >file && git add file && git-commit -m second &&
+       echo two >file && git add file && git commit -m second &&

        two=$(git rev-parse HEAD) &&
 
        test_tick &&
        two=$(git rev-parse HEAD) &&
 
        test_tick &&

-       echo three >file && git add file && git-commit -m third &&
+       echo three >file && git add file && git commit -m third &&

 
        test_tick &&
 
        test_tick &&

-       echo A >file && git add file && git-commit -m A &&
+       echo A >file && git add file && git commit -m A &&

        test_tick &&
        test_tick &&

-       git-tag -a -m A A &&
+       git tag -a -m A A &&

 
        test_tick &&
 
        test_tick &&

-       echo c >file && git add file && git-commit -m c &&
+       echo c >file && git add file && git commit -m c &&

        test_tick &&
        test_tick &&

-       git-tag c &&
+       git tag c &&

 
        git reset --hard $two &&
        test_tick &&
 
        git reset --hard $two &&
        test_tick &&

-       echo B >side && git add side && git-commit -m B &&
+       echo B >side && git add side && git commit -m B &&

        test_tick &&
        test_tick &&

-       git-tag -a -m B B &&
+       git tag -a -m B B &&

 
        test_tick &&
 
        test_tick &&

-       git-merge -m Merged c &&
+       git merge -m Merged c &&

        merged=$(git rev-parse HEAD) &&
 
        git reset --hard $two &&
        test_tick &&
        merged=$(git rev-parse HEAD) &&
 
        git reset --hard $two &&
        test_tick &&

-       echo D >another && git add another && git-commit -m D &&
+       echo D >another && git add another && git commit -m D &&

        test_tick &&
        test_tick &&

-       git-tag -a -m D D &&
+       git tag -a -m D D &&

 
        test_tick &&
        echo DD >another && git commit -a -m another &&
 
        test_tick &&
 
        test_tick &&
        echo DD >another && git commit -a -m another &&
 
        test_tick &&

-       git-tag e &&
+       git tag e &&

 
        test_tick &&
        echo DDD >another && git commit -a -m "yet another" &&
 
        test_tick &&
 
        test_tick &&
        echo DDD >another && git commit -a -m "yet another" &&
 
        test_tick &&

-       git-merge -m Merged $merged &&
+       git merge -m Merged $merged &&

 
        test_tick &&
        echo X >file && echo X >side && git add file side &&
 
        test_tick &&
        echo X >file && echo X >side && git add file side &&

-       git-commit -m x
+       git commit -m x

 
 '
 
 
 '
 

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 8ced59321ef69b6ea2fe3a011f900affea83336e..26995b3cdda32b34b2ecf428e5bbf5ef2ff2fc8a 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -97,27 +97,27 @@ test_atom tag contents 'Tagging at 1151939927
 '
 
 test_expect_success 'Check invalid atoms names are errors' '
 '
 
 test_expect_success 'Check invalid atoms names are errors' '

-       test_must_fail git-for-each-ref --format="%(INVALID)" refs/heads
+       test_must_fail git for-each-ref --format="%(INVALID)" refs/heads

 '
 
 test_expect_success 'Check format specifiers are ignored in naming date atoms' '
 '
 
 test_expect_success 'Check format specifiers are ignored in naming date atoms' '

-       git-for-each-ref --format="%(authordate)" refs/heads &&
-       git-for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
-       git-for-each-ref --format="%(authordate) %(authordate:default)" refs/heads &&
-       git-for-each-ref --format="%(authordate:default) %(authordate:default)" refs/heads
+       git for-each-ref --format="%(authordate)" refs/heads &&
+       git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
+       git for-each-ref --format="%(authordate) %(authordate:default)" refs/heads &&
+       git for-each-ref --format="%(authordate:default) %(authordate:default)" refs/heads

 '
 
 test_expect_success 'Check valid format specifiers for date fields' '
 '
 
 test_expect_success 'Check valid format specifiers for date fields' '

-       git-for-each-ref --format="%(authordate:default)" refs/heads &&
-       git-for-each-ref --format="%(authordate:relative)" refs/heads &&
-       git-for-each-ref --format="%(authordate:short)" refs/heads &&
-       git-for-each-ref --format="%(authordate:local)" refs/heads &&
-       git-for-each-ref --format="%(authordate:iso8601)" refs/heads &&
-       git-for-each-ref --format="%(authordate:rfc2822)" refs/heads
+       git for-each-ref --format="%(authordate:default)" refs/heads &&
+       git for-each-ref --format="%(authordate:relative)" refs/heads &&
+       git for-each-ref --format="%(authordate:short)" refs/heads &&
+       git for-each-ref --format="%(authordate:local)" refs/heads &&
+       git for-each-ref --format="%(authordate:iso8601)" refs/heads &&
+       git for-each-ref --format="%(authordate:rfc2822)" refs/heads

 '
 
 test_expect_success 'Check invalid format specifiers are errors' '
 '
 
 test_expect_success 'Check invalid format specifiers are errors' '

-       test_must_fail git-for-each-ref --format="%(authordate:INVALID)" refs/heads
+       test_must_fail git for-each-ref --format="%(authordate:INVALID)" refs/heads

 '
 
 cat >expected <<\EOF
 '
 
 cat >expected <<\EOF


@@ -207,7 +207,7 @@ refs/tags/testtag
 EOF
 
 test_expect_success 'Verify ascending sort' '
 EOF
 
 test_expect_success 'Verify ascending sort' '

-       git-for-each-ref --format="%(refname)" --sort=refname >actual &&
+       git for-each-ref --format="%(refname)" --sort=refname >actual &&

        test_cmp expected actual
 '
 
        test_cmp expected actual
 '
 


@@ -218,7 +218,7 @@ refs/heads/master
 EOF
 
 test_expect_success 'Verify descending sort' '
 EOF
 
 test_expect_success 'Verify descending sort' '

-       git-for-each-ref --format="%(refname)" --sort=-refname >actual &&
+       git for-each-ref --format="%(refname)" --sort=-refname >actual &&

        test_cmp expected actual
 '
 
        test_cmp expected actual
 '