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>
This commit is contained in:
parent
9b6bf4d575
commit
5354a56fe7
@ -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::
|
||||
|
@ -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: /
|
||||
')
|
||||
@ -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
|
||||
|
@ -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) ||
|
||||
|
@ -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: /'
|
||||
`
|
||||
|
2
ident.c
2
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);
|
||||
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);
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user