Avoid signedness warnings in sha1_file.c

diff --git a/git-cvsimport-script b/git-cvsimport-script
index cdf989161435fd9bbc4791ae4a227be199b6dfae..666de6f09a0c5bd526ec8c526cdfdec15432b580 100755 (executable)
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -40,7 +40,7 @@ END
        exit(1);
 }
 
-getopts("hqvo:d:p:C:z:") or usage();
+getopts("hvo:d:p:C:z:") or usage();
 usage if $opt_h;
 
 @ARGV <= 1 or usage();
@@ -317,6 +317,7 @@ sub file {
            $res = $self->_line($fh);
            die "No input: $fn $rev\n" unless defined $res;
        }
+       close ($fh);
 
        return ($name, $res);
 }
@@ -682,7 +683,7 @@ while(<CVS>) {
                $fn =~ s#^/+##;
                my ($tmpname, $size) = $cvs->file($fn,$rev);
                print "".($init ? "New" : "Update")." $fn: $size bytes.\n" if $opt_v;
-               open my $F, '-|', "git-write-blob $tmpname"
+               open my $F, '-|', "git-hash-object -w $tmpname"
                        or die "Cannot create object: $!\n";
                my $sha = <$F>;
                chomp $sha;