git-blame: Use the same tests for git-blame as for git-annotate

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 00fc3bacda948a4ea2d33079d85a8254080806e8..b46469ab32fa5707c8056c5a32db61d7c268e50b 100755 (executable)
--- 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);
 }
 
@@ -849,8 +846,12 @@ ($$)
                        print "Drop $fn\n" if $opt_v;
                } else {
                        print "".($init ? "New" : "Update")." $fn: $size bytes\n" if $opt_v;
-                       open my $F, '-|', "git-hash-object -w $tmpname"
+                       my $pid = open(my $F, '-|');
+                       die $! unless defined $pid;
+                       if (!$pid) {
+                           exec("git-hash-object", "-w", $tmpname)
                                or die "Cannot create object: $!\n";
+                       }
                        my $sha = <$F>;
                        chomp $sha;
                        close $F;