diff options
| author | Brad Roberts <braddr@puremagic.com> | 2005-08-13 03:22:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-13 18:28:54 -0700 |
| commit | e54c5ea93e0785dfd37fd9201797977a02ca0ddb (patch) | |
| tree | 44b07cd9209b0d75d6c3a84e66608fc489be7cf3 | |
| parent | 31f584c242e7af28018ff920b6c8d1952beadbd4 (diff) | |
| download | git-e54c5ea93e0785dfd37fd9201797977a02ca0ddb.tar.gz git-e54c5ea93e0785dfd37fd9201797977a02ca0ddb.tar.xz | |
[PATCH] fix null TZ problems on os/x
It seems that the localtime() libc routine doesn't care for finding a TZ
that's empty. It's ok with TZ not being set. Setting the TZ to GMT allowed
these tests to pass.
$ uname -v
Darwin Kernel Version 7.9.0: Wed Mar 30 20:11:17 PST 2005; root:xnu/xnu-517.12.7.obj~1/RELEASE_PPC
Signed-off-by: Brad Roberts <braddr@puremagic.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | t/t1100-commit-tree-options.sh | 2 | ||||
| -rwxr-xr-x | t/t5000-tar-tree.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh index e59f724f2..19a0ed4d2 100755 --- a/t/t1100-commit-tree-options.sh +++ b/t/t1100-commit-tree-options.sh @@ -32,7 +32,7 @@ test_expect_success \ GIT_COMMITTER_NAME="Committer Name" \ GIT_COMMITTER_EMAIL="committer@email" \ GIT_COMMITTER_DATE="2005-05-26 23:30" \ - TZ= git-commit-tree `cat treeid` >commitid 2>/dev/null' + TZ=GMT git-commit-tree `cat treeid` >commitid 2>/dev/null' test_expect_success \ 'read commit' \ diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 6d72ed34c..abce66921 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -41,7 +41,7 @@ test_expect_success \ find a -type l | xargs git-update-cache --add && treeid=`git-write-tree` && echo $treeid >treeid && - TZ= GIT_COMMITTER_DATE="2005-05-27 22:00:00" \ + TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \ git-commit-tree $treeid </dev/null >.git/HEAD' test_expect_success \ @@ -50,7 +50,7 @@ test_expect_success \ test_expect_success \ 'validate file modification time' \ - 'TZ= tar tvf b.tar a/a | + 'TZ=GMT tar tvf b.tar a/a | awk \{print\ \$4,\ \(length\(\$5\)\<7\)\ ?\ \$5\":00\"\ :\ \$5\} \ >b.mtime && echo "2005-05-27 22:00:00" >expected.mtime && |