Merge branch 'master' into next

* master: cvsimport: do not barf on creation of an empty file.
2006-05-23 16:31:05 -07:00
parent dcaad49c92 61efa5e300
commit 17cf39294a
1 changed files with 1 additions and 1 deletions
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@ -371,7 +371,7 @@ sub file {
 }
 sub _fetchfile {
 	my ($self, $fh, $cnt) = @_;
-	my $res;
+	my $res = 0;
 	my $bufsize = 1024 * 1024;
 	while($cnt) {
 	    if ($bufsize > $cnt) {