diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-01 16:20:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 16:20:24 -0700 |
| commit | f35bb7c38d546a9e8360cde53c03b0b881ab4475 (patch) | |
| tree | 95411dba99eb6aefcac207aa9ec23b96a24e3ccd | |
| parent | Merge branch 'jc/maint-apply-report-offset' into maint (diff) | |
| parent | git-cvsimport.perl: Bail out right away when reading from the server fails (diff) | |
| download | tgif-f35bb7c38d546a9e8360cde53c03b0b881ab4475.tar.xz | |
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
| -rwxr-xr-x | git-cvsimport.perl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 8e683e5478..bbf327f3e8 100755 --- 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"; |