From: Jeff King <peff@peff.net>
To: "René Scharfe" <l.s.r@web.de>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Ulrich Mueller" <ulm@gentoo.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: [PATCH 1/2] t0006: check --date=format zone offsets
Date: Thu, 15 Jun 2017 09:51:22 -0400 [thread overview]
Message-ID: <20170615135121.jrrxng6ktjfe3wth@sigill.intra.peff.net> (raw)
In-Reply-To: <20170615134958.mzmdmhonjsnconu2@sigill.intra.peff.net>
We already test that "%z" and "%Z" show the right thing, but
we don't actually check that the time we display is the
correct one. Let's add two new tests:
1. Test that "format:" shows the time in the author's
timezone, just like the other time formats.
2. Test that "format-local:" shows time in the local
timezone. We don't want to use our normal UTC for this,
because its offset is zero (so the result would be
"correct" even if the code forgot to apply the offset
or applied it in the wrong direction).
We'll use the EST5 zone, which is already used
elsewhere in the script (and so is assumed to be
available everywhere).
Signed-off-by: Jeff King <peff@peff.net>
---
t/t0006-date.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 71082008f..9f81bec7a 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -31,9 +31,11 @@ check_show () {
format=$1
time=$2
expect=$3
- test_expect_success $4 "show date ($format:$time)" '
+ prereqs=$4
+ zone=$5
+ test_expect_success $prereqs "show date ($format:$time)" '
echo "$time -> $expect" >expect &&
- test-date show:$format "$time" >actual &&
+ TZ=${zone:-$TZ} test-date show:"$format" "$time" >actual &&
test_cmp expect actual
'
}
@@ -57,6 +59,9 @@ check_show 'format:%Z' "$TIME" ''
check_show 'format:%%z' "$TIME" '%z'
check_show 'format-local:%%z' "$TIME" '%z'
+check_show 'format:%Y-%m-%d %H:%M:%S' "$TIME" '2016-06-15 16:13:20'
+check_show 'format-local:%Y-%m-%d %H:%M:%S' "$TIME" '2016-06-15 09:13:20' '' EST5
+
# arbitrary time absurdly far in the future
FUTURE="5758122296 -0400"
check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" TIME_IS_64BIT,TIME_T_IS_64BIT
--
2.13.1.766.g6bea926c5
next prev parent reply other threads:[~2017-06-15 13:51 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-26 18:33 git-2.13.0: log --date=format:%z not working Ulrich Mueller
2017-05-27 16:57 ` Ævar Arnfjörð Bjarmason
2017-05-27 21:46 ` Jeff King
2017-05-28 10:29 ` Ævar Arnfjörð Bjarmason
2017-05-29 0:53 ` Junio C Hamano
2017-05-28 11:43 ` René Scharfe
2017-06-02 2:23 ` Junio C Hamano
2017-06-02 3:08 ` Jeff King
2017-06-02 17:25 ` René Scharfe
2017-06-02 18:35 ` Jeff King
2017-06-02 22:04 ` Ulrich Mueller
2017-06-02 22:30 ` Jeff King
2017-06-02 22:47 ` Ulrich Mueller
2017-06-02 22:51 ` Jeff King
2017-06-03 10:40 ` [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself René Scharfe
2017-06-03 13:13 ` Ulrich Mueller
2017-06-03 16:20 ` René Scharfe
2017-06-07 8:17 ` Jeff King
2017-06-07 9:13 ` [PATCH] date: use localtime() for "-local" time formats Jeff King
2017-06-11 17:36 ` [PATCH] strbuf: let strbuf_addftime handle %z and %Z itself René Scharfe
2017-06-12 15:12 ` Junio C Hamano
2017-06-12 16:16 ` Ævar Arnfjörð Bjarmason
2017-06-12 16:56 ` Ulrich Mueller
2017-06-12 17:53 ` Ævar Arnfjörð Bjarmason
2017-06-12 18:15 ` Junio C Hamano
2017-06-12 18:20 ` Jeff King
2017-06-12 19:02 ` Ævar Arnfjörð Bjarmason
2017-06-12 21:10 ` Jeff King
2017-06-13 6:23 ` Linus Torvalds
2017-06-12 22:31 ` René Scharfe
2017-06-13 10:16 ` Ævar Arnfjörð Bjarmason
2017-06-13 10:31 ` Ulrich Mueller
2017-06-12 16:58 ` René Scharfe
2017-06-12 17:36 ` Jeff King
2017-06-15 8:46 ` [PATCH v2] " René Scharfe
2017-06-15 11:27 ` Ulrich Mueller
2017-06-15 12:28 ` René Scharfe
2017-06-15 12:29 ` [PATCH v3] " René Scharfe
2017-06-15 13:49 ` Jeff King
2017-06-15 13:51 ` Jeff King [this message]
2017-06-15 13:52 ` [PATCH 2/2] date: use localtime() for "-local" time formats Jeff King
2017-06-15 16:12 ` René Scharfe
2017-06-15 21:40 ` Junio C Hamano
2017-06-16 12:18 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170615135121.jrrxng6ktjfe3wth@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=l.s.r@web.de \
--cc=ulm@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).