Merge branch 'ur/svn-local-zone'

gitster · gitster · commit 716c4699ce92 · 2017-08-22T10:29:07.000-07:00
"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
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -1416,7 +1416,7 @@ sub parse_svn_date {`
`1416`	`1416`	`delete $ENV{TZ};`
`1417`	`1417`	`}`
`1418`	`1418`
`1419`		`- my $our_TZ = get_tz_offset();`
	`1419`	`+ my $our_TZ = get_tz_offset($epoch_in_UTC);`
`1420`	`1420`
`1421`	`1421`	`# This converts $epoch_in_UTC into our local timezone.`
`1422`	`1422`	`my ($sec, $min, $hour, $mday, $mon, $year,`