summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-03-07 00:59:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-07 00:59:53 (GMT)
commit4e021dc28e71f9d820f7cf18567d9a86df326753 (patch)
tree7d3b0cf7a0da8c1ad7d77fcf72b9ecbe5dd1319e /log-tree.c
parent42977bf5c7306e4c2dded5353f39cf087cf23a1f (diff)
parent39ab4d0951ba64edcfae7809740715991b44fa6d (diff)
downloadgit-4e021dc28e71f9d820f7cf18567d9a86df326753.zip
git-4e021dc28e71f9d820f7cf18567d9a86df326753.tar.gz
git-4e021dc28e71f9d820f7cf18567d9a86df326753.tar.bz2
Merge branch 'wh/author-committer-ident-config'
Four new configuration variables {author,committer}.{name,email} have been introduced to override user.{name,email} in more specific cases. * wh/author-committer-ident-config: config: allow giving separate author and committer idents
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c
index 3cb1425..1e56df6 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -687,8 +687,7 @@ void show_log(struct rev_info *opt)
*/
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")));
+ has_non_ascii(fmt_name(WANT_COMMITTER_IDENT));
ctx.date_mode = opt->date_mode;
ctx.date_mode_explicit = opt->date_mode_explicit;
ctx.abbrev = opt->diffopt.abbrev;