scripts: use "git foo" not "git-foo"

We want to make sure that people who copy & paste code would see
fewer instances of "git-foo".  The use of these dashed forms have
been discouraged since v1.6.0 days.

Signed-off-by: Michael Forney <mforney@mforney.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index bcf0d92ec223bf9e1f0995c5acef6376d1299502..6c390d6c229d7ef8cca8ae01d33b42b57e29c3b3 100755 (executable)
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -100,7 +100,7 @@ do
        if test $? -ne 0
        then
                gettextln "Simple merge did not work, trying automatic merge."
        if test $? -ne 0
        then
                gettextln "Simple merge did not work, trying automatic merge."

-               git-merge-index -o git-merge-one-file -a ||
+               git merge-index -o git-merge-one-file -a ||

                OCTOPUS_FAILURE=1
                next=$(git write-tree 2>/dev/null)
        fi
                OCTOPUS_FAILURE=1
                next=$(git write-tree 2>/dev/null)
        fi

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 424b034e34b4b40e7c44da16ddf83a31dee6f6a0..9879c59395edff1a02e390397fc623bc60724c57 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -115,16 +115,16 @@ case "${1:-.}${2:-.}${3:-.}" in
                ;;
        esac
 
                ;;
        esac
 

-       src1=$(git-unpack-file $2)
-       src2=$(git-unpack-file $3)
+       src1=$(git unpack-file $2)
+       src2=$(git unpack-file $3)

        case "$1" in
        '')
                echo "Added $4 in both, but differently."
        case "$1" in
        '')
                echo "Added $4 in both, but differently."

-               orig=$(git-unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
+               orig=$(git unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)

                ;;
        *)
                echo "Auto-merging $4"
                ;;
        *)
                echo "Auto-merging $4"

-               orig=$(git-unpack-file $1)
+               orig=$(git unpack-file $1)

                ;;
        esac
 
                ;;
        esac
 

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index c9da747fcfe504b1fd233c68d91e549def0f3571..343fe7bccd0d64f0caff1ad5d3f981729a8e5fc9 100755 (executable)
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -45,7 +45,7 @@ then
        exit 0
 else
        echo "Simple merge failed, trying Automatic merge."
        exit 0
 else
        echo "Simple merge failed, trying Automatic merge."

-       if git-merge-index -o git-merge-one-file -a
+       if git merge-index -o git-merge-one-file -a

        then
                exit 0
        else
        then
                exit 0
        else

diff --git a/git-stash.sh b/git-stash.sh
index 9b6c2da7b4b75980403d836f6fa1fc516bdc3639..9aa09c3a33e5986d534be4c5a4209d234dfa4506 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -573,7 +573,7 @@ apply_stash () {
 
        if test -n "$u_tree"
        then
 
        if test -n "$u_tree"
        then

-               GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
+               GIT_INDEX_FILE="$TMPindex" git read-tree "$u_tree" &&

                GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
                rm -f "$TMPindex" ||
                die "$(gettext "Could not restore untracked files from stash entry")"
                GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
                rm -f "$TMPindex" ||
                die "$(gettext "Could not restore untracked files from stash entry")"

diff --git a/git-submodule.sh b/git-submodule.sh
index e131760eecf944aee97e18a68ab1f171fc0e1d1b..ffa2d66481ab2182a336082bb996d9b3bce32589 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -864,7 +864,7 @@ cmd_summary() {
                                test $status != A && test $ignore_config = all && continue
                        fi
                        # Also show added or modified modules which are checked out
                                test $status != A && test $ignore_config = all && continue
                        fi
                        # Also show added or modified modules which are checked out

-                       GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
+                       GIT_DIR="$sm_path/.git" git rev-parse --git-dir >/dev/null 2>&1 &&

                        printf '%s\n' "$sm_path"
                done
        )
                        printf '%s\n' "$sm_path"
                done
        )


@@ -898,11 +898,11 @@ cmd_summary() {
                missing_dst=
 
                test $mod_src = 160000 &&
                missing_dst=
 
                test $mod_src = 160000 &&

-               ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
+               ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_src^0 >/dev/null &&

                missing_src=t
 
                test $mod_dst = 160000 &&
                missing_src=t
 
                test $mod_dst = 160000 &&

-               ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
+               ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_dst^0 >/dev/null &&

                missing_dst=t
 
                display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")
                missing_dst=t
 
                display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")