diff options
| author | Jeff King <peff@peff.net> | 2012-11-15 00:34:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-16 01:47:24 (GMT) |
| commit | d6991ceedc6a6fbcc2184f8328eb1b4c88b55267 (patch) | |
| tree | bdf8bdcc36cf08cc1b3b3550deea078aa83d381b /builtin | |
| parent | 452802309c422ce71f1c038357ee0775af5fb3eb (diff) | |
| download | git-d6991ceedc6a6fbcc2184f8328eb1b4c88b55267.zip git-d6991ceedc6a6fbcc2184f8328eb1b4c88b55267.tar.gz git-d6991ceedc6a6fbcc2184f8328eb1b4c88b55267.tar.bz2 | |
ident: keep separate "explicit" flags for author and committer
We keep track of whether the user ident was given to us
explicitly, or if we guessed at it from system parameters
like username and hostname. However, we kept only a single
variable. This covers the common cases (because the author
and committer will usually come from the same explicit
source), but can miss two cases:
1. GIT_COMMITTER_* is set explicitly, but we fallback for
GIT_AUTHOR. We claim the ident is explicit, even though
the author is not.
2. GIT_AUTHOR_* is set and we ask for author ident, but
not committer ident. We will claim the ident is
implicit, even though it is explicit.
This patch uses two variables instead of one, updates both
when we set the "fallback" values, and updates them
individually when we read from the environment.
Rather than keep user_ident_sufficiently_given as a
compatibility wrapper, we update the only two callers to
check the committer_ident, which matches their intent and
what was happening already.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 1dd2ec5..d6dd3df 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -755,7 +755,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, ident_shown++ ? "" : "\n", author_ident->buf); - if (!user_ident_sufficiently_given()) + if (!committer_ident_sufficiently_given()) status_printf_ln(s, GIT_COLOR_NORMAL, _("%s" "Committer: %s"), @@ -1265,7 +1265,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1, strbuf_addstr(&format, "\n Author: "); strbuf_addbuf_percentquote(&format, &author_ident); } - if (!user_ident_sufficiently_given()) { + if (!committer_ident_sufficiently_given()) { strbuf_addstr(&format, "\n Committer: "); strbuf_addbuf_percentquote(&format, &committer_ident); if (advice_implicit_identity) { |