undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsimport: format commit timestamp ourselves without using strftime

Browse Source 
Some implementations of strftime(3) lack support for "%z".  Also
there is no need for %s in git-cvsimport as the supplied time is
already in seconds since the epoch.

For %z, use the function get_tz_offset provided by Git.pm instead.

Signed-off-by: Ben Walton <bdwalton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ben Walton 2013-02-09 21:46:58 +00:00 committed by Junio C Hamano
parent 75f7b5dfc4
commit 48c9162857
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-cvsimport.perl
View File

@ -26,6 +26,7 @@ use IO::Socket;
use IO::Pipe; use IO::Pipe;
use POSIX qw(strftime tzset dup2 ENOENT); use POSIX qw(strftime tzset dup2 ENOENT);
use IPC::Open2; use IPC::Open2;
use Git qw(get_tz_offset);
$SIG{'PIPE'}="IGNORE"; $SIG{'PIPE'}="IGNORE";
set_timezone('UTC'); set_timezone('UTC');
@ -864,7 +865,9 @@ sub commit {
} }
set_timezone($author_tz); set_timezone($author_tz);
my $commit_date = strftime("%s %z", localtime($date)); # $date is in the seconds since epoch format
my $tz_offset = get_tz_offset($date);
my $commit_date = "$date $tz_offset";
set_timezone('UTC'); set_timezone('UTC');
$ENV{GIT_AUTHOR_NAME} = $author_name; $ENV{GIT_AUTHOR_NAME} = $author_name;
$ENV{GIT_AUTHOR_EMAIL} = $author_email; $ENV{GIT_AUTHOR_EMAIL} = $author_email;