summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUrs Thuermann <urs@isnogud.escape.de>2017-08-05 00:12:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-08 16:57:44 (GMT)
commit1adc4b9a5886465adc71116b7ff2d5c320731e05 (patch)
treecd8fbd929ec5ca00f93867029f146e6e1f45442d
parentcf8899d285d2648013040ec7196ffd3de0606664 (diff)
downloadgit-1adc4b9a5886465adc71116b7ff2d5c320731e05.zip
git-1adc4b9a5886465adc71116b7ff2d5c320731e05.tar.gz
git-1adc4b9a5886465adc71116b7ff2d5c320731e05.tar.bz2
git svn fetch: Create correct commit timestamp when using --localtime
In parse_svn_date() prepend the correct UTC offset to the timestamp returned. This is the offset in effect at the commit time instead of the offset in effect at calling time. Signed-off-by: Urs Thuermann <urs@isnogud.escape.de> Reviewed-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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 98518f4..bc4eed3 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,