diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-10-26 14:59:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-26 14:59:58 -0700 |
| commit | f34687dc8109dccfebb4957897e611e7ed9e31ff (patch) | |
| tree | e6853ba263bb3c5e30443b531a90aa5b6549d298 /t | |
| parent | Sync with Git 2.29.1 (diff) | |
| parent | rebase: fix broken email with --committer-date-is-author-date (diff) | |
| download | tgif-f34687dc8109dccfebb4957897e611e7ed9e31ff.tar.xz | |
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 't')
| -rwxr-xr-x | t/t3436-rebase-more-options.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh index 996e82787e..eaaf4c8d1d 100755 --- a/t/t3436-rebase-more-options.sh +++ b/t/t3436-rebase-more-options.sh @@ -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 } |