X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=ident.c;h=09cf0c95c9bfc24fa3e4a8f9e212ec42b8a55eba;hb=a0d74d160f3d416be8f7fbfd18fee0eebf40d8e0;hp=ed44a5345a47d4843e8328c0f879ac925dde2b07;hpb=dabc42c7134596092bf59adb83c79b09f729c290;p=git.git

diff --git a/ident.c b/ident.c
index ed44a5345..09cf0c95c 100644
--- a/ident.c
+++ b/ident.c
@@ -204,7 +204,7 @@ const char *fmt_ident(const char *name, const char *email,
 		if ((warn_on_no_name || error_on_no_name) &&
 		    name == git_default_name && env_hint) {
 			fprintf(stderr, env_hint, au_env, co_env);
-			env_hint = NULL; /* warn only once, for "git-var -l" */
+			env_hint = NULL; /* warn only once, for "git var -l" */
 		}
 		if (error_on_no_name)
 			die("empty ident %s <%s> not allowed", name, email);
@@ -250,6 +250,9 @@ const char *git_author_info(int flag)
 
 const char *git_committer_info(int flag)
 {
+	if (getenv("GIT_COMMITTER_NAME") &&
+	    getenv("GIT_COMMITTER_EMAIL"))
+		user_ident_explicitly_given = 1;
 	return fmt_ident(getenv("GIT_COMMITTER_NAME"),
 			 getenv("GIT_COMMITTER_EMAIL"),
 			 getenv("GIT_COMMITTER_DATE"),