diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:52 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:02:52 +0900 |
| commit | e0d52ec4abaefb48073d7c2f2a63f2cb1baf8e72 (patch) | |
| tree | 7da53c93e7179e26b586e717889999f1571d1b6f /perl/Git | |
| parent | Merge branch 'pw/am-signoff' into maint (diff) | |
| parent | git svn fetch: Create correct commit timestamp when using --localtime (diff) | |
| download | tgif-e0d52ec4abaefb48073d7c2f2a63f2cb1baf8e72.tar.xz | |
Merge branch 'ur/svn-local-zone' into maint
"git svn" used with "--localtime" option did not compute the tz
offset for the timestamp in question and instead always used the
current time, which has been corrected.
* ur/svn-local-zone:
git svn fetch: Create correct commit timestamp when using --localtime
Diffstat (limited to 'perl/Git')
| -rw-r--r-- | perl/Git/SVN.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 98518f4ddb..bc4eed3d75 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -1416,7 +1416,7 @@ sub parse_svn_date { delete $ENV{TZ}; } - my $our_TZ = get_tz_offset(); + my $our_TZ = get_tz_offset($epoch_in_UTC); # This converts $epoch_in_UTC into our local timezone. my ($sec, $min, $hour, $mday, $mon, $year, |