summaryrefslogtreecommitdiffstats
path: root/advice.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 /advice.c
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>
Diffstat (limited to 'advice.c')
-rw-r--r--advice.c2
1 files changed, 2 insertions, 0 deletions
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)