X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-cvsimport.perl;h=24f983434249e0c37b7f2229e73c70b374403dc4;hp=00fc3bacda948a4ea2d33079d85a8254080806e8;hb=39ba7d54649b35c943b026b54bff40cfa0153f3e;hpb=3ff903bfb9e34a02f681f1c95ef7aa3ce4d54d2a

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 00fc3bac..24f98343 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -361,6 +361,7 @@ sub _line {
 			}
 		}
 	}
+	return undef;
 }
 sub file {
 	my($self,$fn,$rev) = @_;
@@ -372,19 +373,15 @@ sub file {
 	$self->_file($fn,$rev) and $res = $self->_line($fh);
 
 	if (!defined $res) {
-	    # retry
+	    print STDERR "Server has gone away while fetching $fn $rev, retrying...\n";
+	    truncate $fh, 0;
 	    $self->conn();
-	    $self->_file($fn,$rev)
-		    or die "No file command send\n";
+	    $self->_file($fn,$rev) or die "No file command send";
 	    $res = $self->_line($fh);
-	    die "No input: $fn $rev\n" unless defined $res;
+	    die "Retry failed" unless defined $res;
 	}
 	close ($fh);
 
-	if ($res eq '') {
-	    die "Looks like the server has gone away while fetching $fn $rev -- exiting!";
-	}
-
 	return ($name, $res);
 }