date=@... and GIT_AUTHOR_DATE=@... tests are failing while unsetting GIT_AUTHOR_DATE passes Signed-off-by: Shengfa Lin <shengfa@xxxxxxxxxx> --- t/t7514-commit-patch.sh | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/t/t7514-commit-patch.sh b/t/t7514-commit-patch.sh index 3ba1ff4f81..b87d29f020 100755 --- a/t/t7514-commit-patch.sh +++ b/t/t7514-commit-patch.sh @@ -31,13 +31,32 @@ test_expect_success 'edit hunk "commit --dry-run -p -m message"' ' test -r editor_was_started ' -test_expect_success 'commit date shows timezone offset -0000 when no-record-time-zone is specified' ' - echo test >>file && +test_expect_success 'commit with --date shows timezone offset -0000 when no-record-time-zone is specified' ' + echo test1 >>file && git add file && - TZ=UTC-09 git commit --date=@1600000000 -m "test" --no-record-time-zone && + TZ=UTC-09 git commit --date=@1600000000 -m "test1" --no-record-time-zone && git show -s --format='%aI' >output && echo 2020-09-13T12:26:40-00:00 >expect && test_cmp output expect ' +test_expect_success 'commit with GIT_AUTHOR_DATE shows timezone offset -0000 when no-record-time-zone is specified' ' + echo test2 >>file && + git add file && + export GIT_AUTHOR_DATE=@1600000000 TZ=UTC-09 && + git commit -m "test2" --no-record-time-zone && + git show -s --format='%aI' >output && + echo 2020-09-13T12:26:40-00:00 >expect && + test_cmp output expect +' + +test_expect_success 'commit with unset GIT_AUTHOR_DATE shows timezone offset -0000 when no-record-time-zone is specified' ' + echo test2 >>file && + git add file && + unset GIT_AUTHOR_DATE && + TZ=UTC-09 git commit -m "test2" --no-record-time-zone && + git show -s --format='%aI' >output && + grep "\-00:00" output +' + test_done -- 2.28.0.1011.ga647a8990f-goog