mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 21:24:01 +01:00
Code

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

Browse Source 
* fk/maint-cvsimport-early-failure:
  git-cvsimport.perl: Bail out right away when reading from the server fails
This commit is contained in:
Junio C Hamano 2011-04-01 16:20:24 -07:00
commit f35bb7c38d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-cvsimport.perl
View File

@ -366,7 +366,9 @@ sub conn {
$self->{'socketo'}->write("valid-requests\n"); $self->{'socketo'}->write("valid-requests\n");
$self->{'socketo'}->flush(); $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*//) { if ($rep !~ s/^Valid-requests\s*//) {
$rep="<unknown>" unless $rep; $rep="<unknown>" unless $rep;
die "Expected Valid-requests from server, but got: $rep\n"; die "Expected Valid-requests from server, but got: $rep\n";