diff options
Diffstat (limited to 'git/objects/util.py')
| -rw-r--r-- | git/objects/util.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git/objects/util.py b/git/objects/util.py index f36bf296..d31c4c93 100644 --- a/git/objects/util.py +++ b/git/objects/util.py @@ -156,7 +156,10 @@ def parse_date(string_date): fstruct = time.struct_time((dtstruct.tm_year, dtstruct.tm_mon, dtstruct.tm_mday, tstruct.tm_hour, tstruct.tm_min, tstruct.tm_sec, dtstruct.tm_wday, dtstruct.tm_yday, tstruct.tm_isdst)) - return int(time.mktime(fstruct)), utctz_to_altz(offset) + utctime = time.mktime(fstruct) + # time.mktime returns local time, so we need to adjust it for local offset + utctime -= time.altzone if time.daylight else time.timezone + return int(utctime), utctz_to_altz(offset) except ValueError: continue # END exception handling |