mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-08 12:06:09 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2020-10-26 14:59:58 -07:00
parent 2e673356ae 5f35edd9d7
commit f34687dc81
3 changed files with 5 additions and 5 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 =
xmemdupz(id.name_begin, id.name_end - id.name_begin);
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)
committer = fmt_ident(state->committer_name,
state->author_email, WANT_COMMITTER_IDENT,
state->committer_email, WANT_COMMITTER_IDENT,
state->ignore_date ? NULL
: state->author_date,
IDENT_STRICT);

2
sequencer.c
View File

@ -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;
}

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

@ -65,8 +65,8 @@ test_expect_success '--ignore-whitespace is remembered when continuing' '
'
test_ctime_is_atime () {
git log $1 --format=%ai >authortime &&
git log $1 --format=%ci >committertime &&
git log $1 --format="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> %ai" >authortime &&
git log $1 --format="%cn <%ce> %ci" >committertime &&
test_cmp authortime committertime
}