Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'
[gitweb.git] / perl / Git / SVN.pm
index 6e804a271ca4c6b38b9769f16ace4fb9bc0b88cd..09cff135efd98a486ff767485602d9383e7c3c23 100644 (file)
@@ -480,8 +480,8 @@ sub refname {
        # It cannot end with a slash /, we'll throw up on this because
        # SVN can't have directories with a slash in their name, either:
        if ($refname =~ m{/$}) {
-               die "ref: '$refname' ends with a trailing slash, this is ",
-                   "not permitted by git nor Subversion\n";
+               die "ref: '$refname' ends with a trailing slash; this is ",
+                   "not permitted by git or Subversion\n";
        }
 
        # It cannot have ASCII control character space, tilde ~, caret ^,
@@ -1191,7 +1191,7 @@ sub do_fetch {
                # we can have a branch that was deleted, then re-added
                # under the same name but copied from another path, in
                # which case we'll have multiple parents (we don't
-               # want to break the original ref, nor lose copypath info):
+               # want to break the original ref or lose copypath info):
                if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
                        push @{$log_entry->{parents}}, $lc;
                        return $log_entry;
@@ -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.