summaryrefslogtreecommitdiff
path: root/builtin-commit.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2010-01-13 15:17:08 -0500
committerJunio C Hamano <gitster@pobox.com>2010-01-14 09:25:58 -0800
commitb706fcfe93262e485976ed2bc648b779cc47981f (patch)
treea853676fafad870d31a5efe800d89c9b32bbab8d /builtin-commit.c
parent49ff9a7a02266a1b96e2236bc8f8d95e4b9507dd (diff)
downloadgit-b706fcfe93262e485976ed2bc648b779cc47981f.tar.gz
commit: allow suppression of implicit identity advice
We now nag the user with a giant warning when their identity was pulled from the username, hostname, and gecos information, in case it is not correct. Most users will suppress this by simply setting up their information correctly. However, there may be some users who consciously want to use that information, because having the value change from host to host contains useful information. These users can now set advice.implicitidentity to false to suppress the message. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-commit.c')
-rw-r--r--builtin-commit.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin-commit.c b/builtin-commit.c
index b923038b0a..a73a532f2f 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -994,8 +994,10 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
if (!user_ident_explicitly_given) {
strbuf_addstr(&format, "\n Committer: ");
strbuf_addbuf_percentquote(&format, &committer_ident);
- strbuf_addch(&format, '\n');
- strbuf_addstr(&format, implicit_ident_advice);
+ if (advice_implicit_identity) {
+ strbuf_addch(&format, '\n');
+ strbuf_addstr(&format, implicit_ident_advice);
+ }
}
strbuf_release(&author_ident);
strbuf_release(&committer_ident);