diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-27 00:59:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-27 00:59:58 +0300 |
| commit | f34687dc8109dccfebb4957897e611e7ed9e31ff (patch) | |
| tree | e6853ba263bb3c5e30443b531a90aa5b6549d298 /sequencer.c | |
| parent | 2e673356aefa8ed19be3c878f966ad6189ecb510 (diff) | |
| parent | 5f35edd9d7ebca17f205b338d340cc6ce214644a (diff) | |
Merge branch 'jk/committer-date-is-author-date-fix'
In 2.29, "--committer-date-is-author-date" option of "rebase" and
"am" subcommands lost the e-mail address by mistake, which has been
corrected.
* jk/committer-date-is-author-date-fix:
rebase: fix broken email with --committer-date-is-author-date
am: fix broken email with --committer-date-is-author-date
t3436: check --committer-date-is-author-date result more carefully
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 00acb12496..d76cbded00 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4478,7 +4478,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; } |