summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-22 10:29:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-22 10:29:07 -0700
commit716c4699ce920ca4ae30da32c262c51a56e4c625 (patch)
tree07f1cb67acd508957278f5d14db78fbba952bb25
parentMerge branch 'pw/am-signoff' (diff)
parentgit svn fetch: Create correct commit timestamp when using --localtime (diff)
downloadtgif-716c4699ce920ca4ae30da32c262c51a56e4c625.tar.xz
Merge branch 'ur/svn-local-zone'
"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
-rw-r--r--perl/Git/SVN.pm2
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,