Merge branch 'master' into next

* master:
  cvsimport: do not barf on creation of an empty file.

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 41ee9a6..60fc86a 100755 (executable)
--- 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) {