undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am: fix broken email with --committer-date-is-author-date

Browse Source 
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>
This commit is contained in:
Jeff King 2020-10-23 03:09:39 -04:00 committed by Junio C Hamano
parent 56706dba33
commit 16b0bb99ea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/am.c
View File

@ -161,7 +161,7 @@ static void am_state_init(struct am_state *state)
state->committer_name = state->committer_name =
xmemdupz(id.name_begin, id.name_end - id.name_begin); xmemdupz(id.name_begin, id.name_end - id.name_begin);
state->committer_email = state->committer_email =
xmemdupz(id.mail_begin, id.mail_end - id.mail_end); xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);
} }
/** /**
@ -1595,7 +1595,7 @@ static void do_commit(const struct am_state *state)
if (state->committer_date_is_author_date) if (state->committer_date_is_author_date)
committer = fmt_ident(state->committer_name, committer = fmt_ident(state->committer_name,
state->author_email, WANT_COMMITTER_IDENT, state->committer_email, WANT_COMMITTER_IDENT,
state->ignore_date ? NULL state->ignore_date ? NULL
: state->author_date, : state->author_date,
IDENT_STRICT); IDENT_STRICT);

2
t/t3436-rebase-more-options.sh
View File

@ -70,7 +70,7 @@ test_ctime_is_atime () {
test_cmp authortime committertime test_cmp authortime committertime
} }
test_expect_failure '--committer-date-is-author-date works with apply backend' ' test_expect_success '--committer-date-is-author-date works with apply backend' '
GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author && GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
git rebase --apply --committer-date-is-author-date HEAD^ && git rebase --apply --committer-date-is-author-date HEAD^ &&
test_ctime_is_atime -1 test_ctime_is_atime -1