summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-03 19:06:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-03 19:06:42 (GMT)
commit06b2a0f191f7fe8310fc517360f0186098b68cde (patch)
tree948207e3f5217d9600766a0288b8ce2ca3c6244b
parent2e4b5dee97cb1524a88f0ee90450b139bfaff07b (diff)
parent784f4b6f33afb439a3d95e5751731a88df545889 (diff)
downloadgit-06b2a0f191f7fe8310fc517360f0186098b68cde.zip
git-06b2a0f191f7fe8310fc517360f0186098b68cde.tar.gz
git-06b2a0f191f7fe8310fc517360f0186098b68cde.tar.bz2
Merge branch 'sk/svn-parse-datestamp'
* sk/svn-parse-datestamp: SVN.pm::parse_svn_date: allow timestamps with a single-digit hour
-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 a59564f..09cff13 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1321,7 +1321,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.