Skip to content

Commit

Permalink
Replace uses of "git-var" with "git var"
Browse files Browse the repository at this point in the history
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Todd Zullinger authored and Junio C Hamano committed Jul 30, 2008
1 parent 9b6bf4d commit 5354a56
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Documentation/git-send-email.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
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::
Expand Down
6 changes: 3 additions & 3 deletions contrib/examples/git-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ fi | git stripspace >"$GIT_DIR"/COMMIT_EDITMSG

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: /
')
Expand Down Expand Up @@ -535,8 +535,8 @@ esac

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
Expand Down
2 changes: 1 addition & 1 deletion contrib/examples/git-tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
tagger=$(git var GIT_COMMITTER_IDENT) || exit 1

test -n "$username" ||
username=$(git config user.signingkey) ||
Expand Down
2 changes: 1 addition & 1 deletion git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ fi
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: /'
`
Expand Down
2 changes: 1 addition & 1 deletion ident.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
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);
Expand Down
2 changes: 1 addition & 1 deletion perl/Git.pm
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ This suite of functions retrieves and parses ident information, as stored
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.
Expand Down
2 changes: 1 addition & 1 deletion var.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
#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;
Expand Down

0 comments on commit 5354a56

Please sign in to comment.