Merge branch 'fk/maint-cvsimport-early-failure' into maint

* fk/maint-cvsimport-early-failure: git-cvsimport.perl: Bail out right away when reading from the server fails
git-mirror · Apr 1, 2011 · f35bb7c · f35bb7c
2 parents 4584c94 + e7cad3c
commit f35bb7c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
@@ -366,7 +366,9 @@ sub conn {
 	$self->{'socketo'}->write("valid-requests\n");
 	$self->{'socketo'}->flush();
 
-	chomp(my $rep=$self->readline());
+	my $rep=$self->readline();
+	die "Failed to read from server" unless defined $rep;
+	chomp($rep);
 	if ($rep !~ s/^Valid-requests\s*//) {
 		$rep="<unknown>" unless $rep;
 		die "Expected Valid-requests from server, but got: $rep\n";