Merge branch 'sb/submodule-move-head-error-msg'

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 2d8df831722913093a46e9325796b85f67a97073..b31613cb8aa8decd3f808d5d29e047243fa1eac6 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -601,7 +601,9 @@ ($)
        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;
+       my $y=$1;
+       $y+=100 if $y<70;
+       $y+=1900 if $y<1000;
        return timegm($6||0,$5,$4,$3,$2-1,$y);
 }