diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 03:59:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 03:59:53 +0300 |
| commit | 4e021dc28e71f9d820f7cf18567d9a86df326753 (patch) | |
| tree | 7d3b0cf7a0da8c1ad7d77fcf72b9ecbe5dd1319e /sequencer.c | |
| parent | 42977bf5c7306e4c2dded5353f39cf087cf23a1f (diff) | |
| parent | 39ab4d0951ba64edcfae7809740715991b44fa6d (diff) | |
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 'sequencer.c')
| -rw-r--r-- | sequencer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c index 0db410d590..3209cdefd1 100644 --- a/sequencer.c +++ b/sequencer.c @@ -837,7 +837,7 @@ static const char *read_author_ident(struct strbuf *buf) } strbuf_reset(&out); - strbuf_addstr(&out, fmt_ident(name, email, date, 0)); + strbuf_addstr(&out, fmt_ident(name, email, WANT_AUTHOR_IDENT, date, 0)); strbuf_swap(buf, &out); strbuf_release(&out); free(name); @@ -4098,8 +4098,7 @@ void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag) int has_footer; strbuf_addstr(&sob, sign_off_header); - strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"), - getenv("GIT_COMMITTER_EMAIL"))); + strbuf_addstr(&sob, fmt_name(WANT_COMMITTER_IDENT)); strbuf_addch(&sob, '\n'); if (!ignore_footer) |