diff options
| author |  Jeff King <peff@peff.net> | 2020-10-23 03:09:39 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-23 08:25:19 -0700 |
| commit | 16b0bb99eac5ebd02a5dcabdff2cfc390e9d92ef (patch) | |
| tree | d0e42501b1cf65395e91e22e74f75fc5caa0286e /builtin/merge-base.c | |
| parent | t3436: check --committer-date-is-author-date result more carefully (diff) | |
| download | tgif-16b0bb99eac5ebd02a5dcabdff2cfc390e9d92ef.tar.xz | |
am: fix broken email with --committer-date-is-author-date
Commit e8cbe2118a (am: stop exporting GIT_COMMITTER_DATE, 2020-08-17)
rewrote the code for setting the committer date to use fmt_ident(),
rather than setting an environment variable and letting commit_tree()
handle it. But it introduced two bugs:
- we use the author email string instead of the committer email
- when parsing the committer ident, we used the wrong variable to
compute the length of the email, resulting in it always being a
zero-length string
This commit fixes both, which causes our test of this option via the
rebase "apply" backend to now succeed.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions