summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-18 18:48:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-18 18:48:01 (GMT)
commitb94ead75945fe7dbe8fbfeb48070a6b54d02e318 (patch)
tree8b3d4c9a29e5cac2fbe10ccf3dffc025db48a372 /git-svn.perl
parentdf5d10a32ebc4f2305e13b70e2c01e4fa2cc73f0 (diff)
downloadgit-b94ead75945fe7dbe8fbfeb48070a6b54d02e318.zip
git-b94ead75945fe7dbe8fbfeb48070a6b54d02e318.tar.gz
git-b94ead75945fe7dbe8fbfeb48070a6b54d02e318.tar.bz2
git-svn: fix parsing of timestamp obtained from svn
Ward Wouts reports that git-svn barfed like this: Unable to parse date: 2004-03-09T09:44:33.Z at /usr/bin/git-svn line 3995 The parse_svn_date sub expects there always are one or more digits after the decimal point to record fractional seconds, but this example does not and results in a failure like this. The fix is based on the original fix by the reporter, further cleaned up. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 83cb36f..cbc5211 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2526,7 +2526,7 @@ sub get_untracked {
sub parse_svn_date {
my $date = shift || return '+0000 1970-01-01 00:00:00';
my ($Y,$m,$d,$H,$M,$S) = ($date =~ /^(\d{4})\-(\d\d)\-(\d\d)T
- (\d\d)\:(\d\d)\:(\d\d).\d+Z$/x) or
+ (\d\d)\:(\d\d)\:(\d\d)\.\d*Z$/x) or
croak "Unable to parse date: $date\n";
my $parsed_date; # Set next.