summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2020-10-23 07:10:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-10-23 15:25:22 (GMT)
commit5f35edd9d7ebca17f205b338d340cc6ce214644a (patch)
tree33c547ab8dae6c1cedef2af684dd08a0dd9086fe /sequencer.c
parent16b0bb99eac5ebd02a5dcabdff2cfc390e9d92ef (diff)
downloadgit-5f35edd9d7ebca17f205b338d340cc6ce214644a.zip
git-5f35edd9d7ebca17f205b338d340cc6ce214644a.tar.gz
git-5f35edd9d7ebca17f205b338d340cc6ce214644a.tar.bz2
rebase: fix broken email with --committer-date-is-author-date
Commit 7573cec52c (rebase -i: support --committer-date-is-author-date, 2020-08-17) copied the committer ident-parsing code from builtin/am.c. And in doing so, it copied a bug in which we always set the email to an empty string. We fixed the version in git-am in the previous commit; this commit fixes the copied code. Reported-by: VenomVendor <info@venomvendor.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index 4ccb545..9dcd3db 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -4369,7 +4369,7 @@ static int init_committer(struct replay_opts *opts)
opts->committer_name =
xmemdupz(id.name_begin, id.name_end - id.name_begin);
opts->committer_email =
- xmemdupz(id.mail_begin, id.mail_end - id.mail_end);
+ xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);
return 0;
}