From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> Sorry I somehow forgot to commit this before sending the v4 patches, it fixes up the final patch Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> --- t/t3436-rebase-more-options.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh index 5ee193f333..ecfd68397f 100755 --- a/t/t3436-rebase-more-options.sh +++ b/t/t3436-rebase-more-options.sh @@ -196,7 +196,7 @@ test_expect_success '--ignore-date is an alias for --reset-author-date' ' git rebase --apply --ignore-date HEAD^ && git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" && git rebase -m --ignore-date HEAD^ && - git log -2 --pretty="format:%ai" >authortime && + git log -2 --pretty=%ai >authortime && grep "+0000" authortime >output && test_line_count = 2 output ' -- 2.26.2
