diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 01:59:53 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 01:59:53 +0100 |
| commit | 4e021dc28e71f9d820f7cf18567d9a86df326753 (patch) | |
| tree | 7d3b0cf7a0da8c1ad7d77fcf72b9ecbe5dd1319e /log-tree.c | |
| parent | Merge branch 'aw/pretty-trailers' (diff) | |
| parent | config: allow giving separate author and committer idents (diff) | |
| download | git-4e021dc28e71f9d820f7cf18567d9a86df326753.tar.xz git-4e021dc28e71f9d820f7cf18567d9a86df326753.zip | |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c index 3cb14256ec..1e56df62a7 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; |