Make "empty ident" error message a bit more helpful.
It appears that some people who did not care about having bogus names in their own commit messages are bitten by the recent change to require a sane environment [*1*]. While it was a good idea to prevent people from using bogus names to create commits and doing sign-offs, the error message is not very informative. This patch attempts to warn things upfront and hint people how to fix their environments. [Footnote] *1* The thread is this one. http://marc.theaimsgroup.com/?t=113868084800004 Especially this message. http://marc.theaimsgroup.com/?m=113932830015032 Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Feb 18, 2006 at 01:20 UTC
2fb4a21074cdd62ecdbb1fd491f743483275e2a4
1 file changed
+14
ident.c
+14
@@ -46,6 +46,15 @@ static void copy_gecos(struct passwd *w, char *name, int sz)
46
47
}
48
49
+static const char au_env[] = "GIT_AUTHOR_NAME";
50
+static const char co_env[] = "GIT_COMMITTER_NAME";
51
+static const char env_hint[] =
52
+"\n*** Environment problem:\n"
53
+"*** Your name cannot be determined from your system services (gecos).\n"
54
+"*** You would need to set %s and %s\n"
55
+"*** environment variables; otherwise you won't be able to perform\n"
56
+"*** certain operations because of \"empty ident\" errors.\n\n";
57
+
58
int setup_ident(void)
59
{
60
int len;
@@ -57,6 +66,11 @@ int setup_ident(void)
66
/* Get the name ("gecos") */
67
copy_gecos(pw, git_default_name, sizeof(git_default_name));
68
69
+ if (!*git_default_name) {
70
+ if (!getenv(au_env) || !getenv(co_env))
71
+ fprintf(stderr, env_hint, au_env, co_env);
72
+ }
73
+
74
/* Make up a fake email address (name + '@' + hostname [+ '.' + domainname]) */
75
len = strlen(pw->pw_name);
76
if (len > sizeof(git_default_email)/2)