diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-05 11:56:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-05 11:56:53 -0700 |
| commit | ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37 (patch) | |
| tree | 7b8f807cb10afdb7e94e090f7bedc3e7faf36429 /t | |
| parent | 16adc7cb048f9c31e80b4409aa599d485595c4e0 (diff) | |
| parent | 6b097788f88a29d6e171af7a9e87117cf992e833 (diff) | |
| download | git-ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37.tar.gz git-ad9d8e8f0f13e054ee30fcdcdb51973ddcfadb37.tar.xz | |
Merge branch 'maint'
* maint:
t0006: test timezone parsing
rerere.txt: Document forget subcommand
Documentation/git-gc.txt: add reference to githooks
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0006-date.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t0006-date.sh b/t/t0006-date.sh index 75b02af86..3ea4f9eff 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh @@ -28,8 +28,8 @@ check_show 31449600 '12 months ago' check_parse() { echo "$1 -> $2" >expect - test_expect_${3:-success} "parse date ($1)" " - test-date parse '$1' >actual && + test_expect_${4:-success} "parse date ($1${3:+ TZ=$3})" " + TZ=${3:-$TZ} test-date parse '$1' >actual && test_cmp expect actual " } @@ -38,6 +38,7 @@ check_parse 2008 bad check_parse 2008-02 bad check_parse 2008-02-14 bad check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000' +check_parse '2008-02-14 20:30:45 -0500' '2008-02-14 20:30:45 -0500' check_approxidate() { echo "$1 -> $2 +0000" >expect |