aboutsummaryrefslogtreecommitdiff
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
parent49ff9a7a02266a1b96e2236bc8f8d95e4b9507dd (diff)
downloadgit-b706fcfe93262e485976ed2bc648b779cc47981f.tar.gz
git-b706fcfe93262e485976ed2bc648b779cc47981f.tar.xz
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>
-rw-r--r--Documentation/config.txt4
-rw-r--r--advice.c2
-rw-r--r--advice.h1
-rw-r--r--builtin-commit.c6
4 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a1e36d7e4..6f70cc953 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -130,6 +130,10 @@ advice.*::
Advice shown when linkgit:git-merge[1] refuses to
merge to avoid overwritting local changes.
Default: true.
+ implicitIdentity::
+ Advice on how to set your identity configuration when
+ your information is guessed from the system username and
+ domain name. Default: true.
--
core.fileMode::
diff --git a/advice.c b/advice.c
index cb666acc3..8f7de0e9e 100644
--- a/advice.c
+++ b/advice.c
@@ -3,6 +3,7 @@
int advice_push_nonfastforward = 1;
int advice_status_hints = 1;
int advice_commit_before_merge = 1;
+int advice_implicit_identity = 1;
static struct {
const char *name;
@@ -11,6 +12,7 @@ static struct {
{ "pushnonfastforward", &advice_push_nonfastforward },
{ "statushints", &advice_status_hints },
{ "commitbeforemerge", &advice_commit_before_merge },
+ { "implicitidentity", &advice_implicit_identity },
};
int git_default_advice_config(const char *var, const char *value)
diff --git a/advice.h b/advice.h
index 3de5000d8..728ab90ef 100644
--- a/advice.h
+++ b/advice.h
@@ -4,6 +4,7 @@
extern int advice_push_nonfastforward;
extern int advice_status_hints;
extern int advice_commit_before_merge;
+extern int advice_implicit_identity;
int git_default_advice_config(const char *var, const char *value);
diff --git a/builtin-commit.c b/builtin-commit.c
index b923038b0..a73a532f2 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);