Imported Upstream version 2.25.1

[platform/upstream/git.git] / git-cvsimport.perl

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 2d8df83..1057f38 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -600,8 +600,10 @@ my $cvs = CVSconn->new($opt_d, $cvs_tree);
 sub pdate($) {
        my ($d) = @_;
        m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
-               or die "Unparseable date: $d\n";
-       my $y=$1; $y-=1900 if $y>1900;
+               or die "Unparsable date: $d\n";
+       my $y=$1;
+       $y+=100 if $y<70;
+       $y+=1900 if $y<1000;
        return timegm($6||0,$5,$4,$3,$2-1,$y);
 }