Replace uses of "git-var" with "git var"

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index afbb294a7faadc7ff6d4039246dc1c085575cd4f..e2437f30ca1314dc00a55f72c4e2a325cc75c7b6 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -56,7 +56,7 @@ The --cc option must be repeated for each user you want on the cc list.
 
 --from::
        Specify the sender of the emails.  This will default to
 
 --from::
        Specify the sender of the emails.  This will default to

-       the value GIT_COMMITTER_IDENT, as returned by "git-var -l".
+       the value GIT_COMMITTER_IDENT, as returned by "git var -l".

        The user will still be prompted to confirm this entry.
 
 --in-reply-to::
        The user will still be prompted to confirm this entry.
 
 --in-reply-to::

diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index 2c4a4062a5317c51601fc4c644c96a7f75e1ef2c..5c72f655c7e4fb1bd18e979d33bd94062fce8c1a 100755 (executable)
--- a/contrib/examples/git-commit.sh
+++ b/contrib/examples/git-commit.sh
@@ -443,7 +443,7 @@ fi | git stripspace >"$GIT_DIR"/COMMIT_EDITMSG
 
 case "$signoff" in
 t)
 
 case "$signoff" in
 t)

-       sign=$(git-var GIT_COMMITTER_IDENT | sed -e '
+       sign=$(git var GIT_COMMITTER_IDENT | sed -e '

                s/>.*/>/
                s/^/Signed-off-by: /
                ')
                s/>.*/>/
                s/^/Signed-off-by: /
                ')


@@ -535,8 +535,8 @@ esac
 
 case "$no_edit" in
 '')
 
 case "$no_edit" in
 '')

-       git-var GIT_AUTHOR_IDENT > /dev/null  || die
-       git-var GIT_COMMITTER_IDENT > /dev/null  || die
+       git var GIT_AUTHOR_IDENT > /dev/null  || die
+       git var GIT_COMMITTER_IDENT > /dev/null  || die

        git_editor "$GIT_DIR/COMMIT_EDITMSG"
        ;;
 esac
        git_editor "$GIT_DIR/COMMIT_EDITMSG"
        ;;
 esac

diff --git a/contrib/examples/git-tag.sh b/contrib/examples/git-tag.sh
index e9f3a228af472c932f6cec5fa25ae49cd841b239..2c15bc955b5bdf64119cdef87ad7519900cdd35f 100755 (executable)
--- a/contrib/examples/git-tag.sh
+++ b/contrib/examples/git-tag.sh
@@ -164,7 +164,7 @@ git check-ref-format "tags/$name" ||
 
 object=$(git rev-parse --verify --default HEAD "$@") || exit 1
 type=$(git cat-file -t $object) || exit 1
 
 object=$(git rev-parse --verify --default HEAD "$@") || exit 1
 type=$(git cat-file -t $object) || exit 1

-tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
+tagger=$(git var GIT_COMMITTER_IDENT) || exit 1

 
 test -n "$username" ||
        username=$(git config user.signingkey) ||
 
 test -n "$username" ||
        username=$(git config user.signingkey) ||

diff --git a/git-am.sh b/git-am.sh
index 6aa819280ef99ccbbdeefde037e99fae3e6f0110..8f91a97eb3a07908b35de086d555822c928fd2e9 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -291,7 +291,7 @@ fi
 ws=`cat "$dotest/whitespace"`
 if test "$(cat "$dotest/sign")" = t
 then
 ws=`cat "$dotest/whitespace"`
 if test "$(cat "$dotest/sign")" = t
 then

-       SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e '
+       SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '

                        s/>.*/>/
                        s/^/Signed-off-by: /'
                `
                        s/>.*/>/
                        s/^/Signed-off-by: /'
                `

diff --git a/ident.c b/ident.c
index b35504a8d25594a8d243ae7490733eae5a262712..09cf0c95c9bfc24fa3e4a8f9e212ec42b8a55eba 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -204,7 +204,7 @@ const char *fmt_ident(const char *name, const char *email,
                if ((warn_on_no_name || error_on_no_name) &&
                    name == git_default_name && env_hint) {
                        fprintf(stderr, env_hint, au_env, co_env);
                if ((warn_on_no_name || error_on_no_name) &&
                    name == git_default_name && env_hint) {
                        fprintf(stderr, env_hint, au_env, co_env);

-                       env_hint = NULL; /* warn only once, for "git-var -l" */
+                       env_hint = NULL; /* warn only once, for "git var -l" */

                }
                if (error_on_no_name)
                        die("empty ident %s <%s> not allowed", name, email);
                }
                if (error_on_no_name)
                        die("empty ident %s <%s> not allowed", name, email);

diff --git a/perl/Git.pm b/perl/Git.pm
index d99e7782002e01079b3866003cc8555b7e130e3f..087d3d0e829ce0e9b39c581bc9f088f0d72e36f3 100644 (file)
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -730,7 +730,7 @@ sub remote_refs {
 in the commit and tag objects or produced by C<var GIT_type_IDENT> (thus
 C<TYPE> can be either I<author> or I<committer>; case is insignificant).
 
 in the commit and tag objects or produced by C<var GIT_type_IDENT> (thus
 C<TYPE> can be either I<author> or I<committer>; case is insignificant).
 

-The C<ident> method retrieves the ident information from C<git-var>
+The C<ident> method retrieves the ident information from C<git var>

 and either returns it as a scalar string or as an array with the fields parsed.
 Alternatively, it can take a prepared ident string (e.g. from the commit
 object) and just parse it.
 and either returns it as a scalar string or as an array with the fields parsed.
 Alternatively, it can take a prepared ident string (e.g. from the commit
 object) and just parse it.

diff --git a/var.c b/var.c
index 724ba87a7c9ccb16bc506fc3f25710a4b78e3006..f1eb314e899c518b8dea54b4ff8f3923da7b12cf 100644 (file)
--- a/var.c
+++ b/var.c
@@ -5,7 +5,7 @@
  */
 #include "cache.h"
 
  */
 #include "cache.h"
 

-static const char var_usage[] = "git-var [-l | <variable>]";
+static const char var_usage[] = "git var [-l | <variable>]";

 
 struct git_var {
        const char *name;
 
 struct git_var {
        const char *name;