summaryrefslogtreecommitdiff
path: root/ident.c
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@xs4all.nl>2006-11-28 10:27:39 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-29 00:33:45 (GMT)
commitd5cc2de9ff57d2f6734f6e6e34addc2fae1b5b0e (patch)
tree3c90c74d71b91cccc77a7fb00c88ab6e2d7b7409 /ident.c
parent67ffa1142585742601011440a17528ef841bbf44 (diff)
downloadgit-d5cc2de9ff57d2f6734f6e6e34addc2fae1b5b0e.zip
git-d5cc2de9ff57d2f6734f6e6e34addc2fae1b5b0e.tar.gz
git-d5cc2de9ff57d2f6734f6e6e34addc2fae1b5b0e.tar.bz2
ident.c: Trim hint printed when gecos is empty.
Also remove asterisks for readability, and suggest use of git-config for easy cut & pasting. Signed-off-by: Han-Wen Nienhuys <hanwen@xs4all.nl> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'ident.c')
-rw-r--r--ident.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/ident.c b/ident.c
index efec97f..e415fd3 100644
--- a/ident.c
+++ b/ident.c
@@ -158,12 +158,17 @@ static int copy(char *buf, int size, int offset, const char *src)
static const char au_env[] = "GIT_AUTHOR_NAME";
static const char co_env[] = "GIT_COMMITTER_NAME";
static const char *env_hint =
-"\n*** Environment problem:\n"
+"\n"
"*** Your name cannot be determined from your system services (gecos).\n"
-"*** You would need to set %s and %s\n"
-"*** environment variables; otherwise you won't be able to perform\n"
-"*** certain operations because of \"empty ident\" errors.\n"
-"*** Alternatively, you can use user.name configuration variable.\n\n";
+"\n"
+"Run\n"
+"\n"
+" git repo-config user.email \"you@email.com\"\n"
+" git repo-config user.name \"Your Name\"\n"
+"\n"
+"To set the identity in this repository.\n"
+"Add --global to set your account\'s default\n"
+"\n";
static const char *get_ident(const char *name, const char *email,
const char *date_str, int error_on_no_name)