@matheusbsbs / matheus-bagliano / commits / e7cad3ccd0
Fork 0

git-cvsimport.perl: Bail out right away when reading from the server fails

If the CVS server is down, this reduced the git-cvsimport output from: ssh: connect to host ijbswa.cvs.sourceforge.net port 22: Connection refused Use of uninitialized value $rep in scalar chomp at /usr/local/libexec/git-core/git-cvsimport line 369. Use of uninitialized value $rep in substitution (s///) at /usr/local/libexec/git-core/git-cvsimport line 370. Expected Valid-requests from server, but got: <unknown> to the less noisy: ssh: connect to host ijbswa.cvs.sourceforge.net port 22: Connection refused Failed to read from server at /usr/local/libexec/git-core/git-cvsimport line 370. In this case a silent exit() instead of the die() would probably do, but I assume that there could be cases where the connection attempt succeeds, but reading from the server fails for other reasons. Signed-off-by: Fabian Keil <fk@fabiankeil.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fabian Keil committed Jan 31, 2011 at 20:29 UTC e7cad3ccd05461b0defdef86c9d786ab6fb9fe40
1 file changed +3 -1
git-cvsimport.perl
+3 -1
@@ -366,7 +366,9 @@ sub conn {
366 $self->{'socketo'}->write("valid-requests\n");
367 $self->{'socketo'}->flush();
368
369 - chomp(my $rep=$self->readline());
369 + my $rep=$self->readline();
370 + die "Failed to read from server" unless defined $rep;
371 + chomp($rep);
372 if ($rep !~ s/^Valid-requests\s*//) {
373 $rep="<unknown>" unless $rep;
374 die "Expected Valid-requests from server, but got: $rep\n";