summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:52 -0700
commitf59c6e6ccb1386f0fdde2753f62536dfd3343118 (patch)
treec270485f41e5100c47da29fe0e5b6e432bc438ba /t
parentMerge branch 'jc/renormalize-merge-kill-safer-crlf' into maint (diff)
parentdate: clarify --date=raw description (diff)
downloadtgif-f59c6e6ccb1386f0fdde2753f62536dfd3343118.tar.xz
Merge branch 'jk/reflog-date' into maint
The reflog output format is documented better, and a new format --date=unix to report the seconds-since-epoch (without timezone) has been added. * jk/reflog-date: date: clarify --date=raw description date: add "unix" format date: document and test "raw-local" mode doc/pretty-formats: explain shortening of %gd doc/pretty-formats: describe index/time formats for %gd doc/rev-list-options: explain "-g" output formats doc/rev-list-options: clarify "commit@{Nth}" for "-g" option
Diffstat (limited to 't')
-rwxr-xr-xt/t0006-date.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 4c8cf58512..c0c910867d 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -46,7 +46,10 @@ check_show rfc2822 "$TIME" 'Wed, 15 Jun 2016 16:13:20 +0200'
check_show short "$TIME" '2016-06-15'
check_show default "$TIME" 'Wed Jun 15 16:13:20 2016 +0200'
check_show raw "$TIME" '1466000000 +0200'
+check_show unix "$TIME" '1466000000'
check_show iso-local "$TIME" '2016-06-15 14:13:20 +0000'
+check_show raw-local "$TIME" '1466000000 +0000'
+check_show unix-local "$TIME" '1466000000'
# arbitrary time absurdly far in the future
FUTURE="5758122296 -0400"