mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wh/author-committer-ident-config'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2019-03-07 09:59:53 +09:00
parent 42977bf5c7 39ab4d0951
commit 4e021dc28e
10 changed files with 197 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sequencer.c
View File

@ -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)