WORK-AROUND: force fmt_ident(...) to succeed

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

ident.c

@@ -436,6 +436,12 @@ const char *git_author_info(int flag)
 		author_ident_explicitly_given |= IDENT_NAME_GIVEN;
 	if (getenv("GIT_AUTHOR_EMAIL"))
 		author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
+	if (1) {
+		char *name = xstrdup_or_null(getenv("GIT_AUTHOR_NAME")), *email = xstrdup_or_null(getenv("GIT_AUTHOR_EMAIL")), *date = xstrdup_or_null(getenv("GIT_AUTHOR_DATE"));
+		const char *res = fmt_ident(name, email, date, flag);
+		free(name); free(email); free(date);
+		return res;
+	}
 	return fmt_ident(getenv("GIT_AUTHOR_NAME"),
 			 getenv("GIT_AUTHOR_EMAIL"),
 			 getenv("GIT_AUTHOR_DATE"),
@@ -448,6 +454,12 @@ const char *git_committer_info(int flag)
 		committer_ident_explicitly_given |= IDENT_NAME_GIVEN;
 	if (getenv("GIT_COMMITTER_EMAIL"))
 		committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
+	if (1) {
+		char *name = xstrdup_or_null(getenv("GIT_COMMITTER_NAME")), *email = xstrdup_or_null(getenv("GIT_COMMITTER_EMAIL")), *date = xstrdup_or_null(getenv("GIT_COMMITTER_DATE"));
+		const char *res = fmt_ident(name, email, date, flag);
+		free(name); free(email); free(date);
+		return res;
+	}
 	return fmt_ident(getenv("GIT_COMMITTER_NAME"),
 			 getenv("GIT_COMMITTER_EMAIL"),
 			 getenv("GIT_COMMITTER_DATE"),

log-tree.c

@@ -685,10 +685,12 @@ void show_log(struct rev_info *opt)
 	/*
 	 * And then the pretty-printed message itself
 	 */
-	if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
-		ctx.need_8bit_cte =
-			has_non_ascii(fmt_name(getenv("GIT_COMMITTER_NAME"),
-					       getenv("GIT_COMMITTER_EMAIL")));
+	if (ctx.need_8bit_cte >= 0 && opt->add_signoff) {
+		char *name = xstrdup_or_null(getenv("GIT_COMMITTER_NAME")), *email = xstrdup_or_null(getenv("GIT_COMMITTER_EMAIL"));
+
+		ctx.need_8bit_cte = has_non_ascii(fmt_name(name, email));
+		free(name); free(email);
+	}
 	ctx.date_mode = opt->date_mode;
 	ctx.date_mode_explicit = opt->date_mode_explicit;
 	ctx.abbrev = opt->diffopt.abbrev;

sequencer.c

@@ -4034,10 +4034,11 @@ void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag)
 	unsigned no_dup_sob = flag & APPEND_SIGNOFF_DEDUP;
 	struct strbuf sob = STRBUF_INIT;
 	int has_footer;
+	char *name = xstrdup_or_null(getenv("GIT_COMMITTER_NAME")), *email = xstrdup_or_null(getenv("GIT_COMMITTER_EMAIL"));
 
 	strbuf_addstr(&sob, sign_off_header);
-	strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
-				getenv("GIT_COMMITTER_EMAIL")));
+	strbuf_addstr(&sob, fmt_name(name, email));
+	FREE_AND_NULL(name); FREE_AND_NULL(email);
 	strbuf_addch(&sob, '\n');
 
 	if (!ignore_footer)