From: Ben Walton <bwalton@artsci.utoronto.ca>
Date: Tue, 24 Feb 2009 19:44:49 +0000 (-0500)
Subject: git-svn fix to avoid using strftime %z
X-Git-Tag: v1.6.2-rc2~12^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e871784132038a500f3390859da3bbe95b9a0fc2;p=git.git

git-svn fix to avoid using strftime %z

%z isn't available on all platforms in the date formatting
routines.  Provide a workalike capability that should be
more portable.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Acked-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index d8476c81e..d967594ee 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -4630,6 +4630,7 @@ package Git::SVN::Log;
 use strict;
 use warnings;
 use POSIX qw/strftime/;
+use Time::Local;
 use constant commit_log_separator => ('-' x 72) . "\n";
 use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline
             %rusers $show_commit $incremental/;
@@ -4736,7 +4737,12 @@ sub run_pager {
 }
 
 sub format_svn_date {
-	return strftime("%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)", localtime(shift));
+	# some systmes don't handle or mishandle %z, so be creative.
+	my $t = shift;
+	my $gm = timelocal(gmtime($t));
+	my $sign = qw( + + - )[ $t <=> $gm ];
+	my $gmoff = sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
+	return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t));
 }
 
 sub parse_git_date {