From: Simon Hausmann <simon@lst.de>
Date: Sat, 14 Apr 2007 09:21:50 +0000 (+0200)
Subject: Fix the timezone formatting. Now qgit also displays (parses) it correctly.
X-Git-Tag: v1.5.3-rc0~65^2^2~131
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f291b4e3d47fb03a65c0dfcfbd28f8fabb6187c1;p=git.git

Fix the timezone formatting. Now qgit also displays (parses) it correctly.

Signed-off-by: Simon Hausmann <simon@lst.de>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 6db757ae4..44a07c27c 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -922,10 +922,7 @@ class P4Sync(Command):
             except:
                 pass
 
-        self.tz = - time.timezone / 36
-        tzsign = ("%s" % self.tz)[0]
-        if tzsign != '+' and tzsign != '-':
-            self.tz = "+" + ("%s" % self.tz)
+        self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
 
         self.gitOutput, self.gitStream, self.gitError = popen2.popen3("git fast-import")