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>
Jeff King committed
Oct 23, 2020 at 03:09 UTC
16b0bb99eac5ebd02a5dcabdff2cfc390e9d92ef
2 files changed
+3
-3
builtin/am.c
+2
-2
@@ -161,7 +161,7 @@ static void am_state_init(struct am_state *state)
161
state->committer_name =
162
xmemdupz(id.name_begin, id.name_end - id.name_begin);
163
state->committer_email =
164
- xmemdupz(id.mail_begin, id.mail_end - id.mail_end);
164
+ xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);
165
}
166
167
/**
@@ -1595,7 +1595,7 @@ static void do_commit(const struct am_state *state)
1595
1596
if (state->committer_date_is_author_date)
1597
committer = fmt_ident(state->committer_name,
1598
- state->author_email, WANT_COMMITTER_IDENT,
1598
+ state->committer_email, WANT_COMMITTER_IDENT,
1599
state->ignore_date ? NULL
1600
: state->author_date,
1601
IDENT_STRICT);
t/t3436-rebase-more-options.sh
+1
-1
@@ -70,7 +70,7 @@ test_ctime_is_atime () {
70
test_cmp authortime committertime
71
}
72
73
-test_expect_failure '--committer-date-is-author-date works with apply backend' '
73
+test_expect_success '--committer-date-is-author-date works with apply backend' '
74
GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
75
git rebase --apply --committer-date-is-author-date HEAD^ &&
76
test_ctime_is_atime -1