Merge branch 'master' into sp/reflog

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 41ee9a608d762718c33594374dfa4cb3205dd4f9..af331d9c4316a56db7bd4b3cfb4f1d5d8d5f6de5 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) {
@@ -618,14 +618,13 @@ sub commit {
        }
 
        my $commit_date = strftime("+0000 %Y-%m-%d %H:%M:%S",gmtime($date));
+       $ENV{GIT_AUTHOR_NAME} = $author_name;
+       $ENV{GIT_AUTHOR_EMAIL} = $author_email;
+       $ENV{GIT_AUTHOR_DATE} = $commit_date;
+       $ENV{GIT_COMMITTER_NAME} = $author_name;
+       $ENV{GIT_COMMITTER_EMAIL} = $author_email;
+       $ENV{GIT_COMMITTER_DATE} = $commit_date;
        my $pid = open2(my $commit_read, my $commit_write,
-               'env',
-               "GIT_AUTHOR_NAME=$author_name",
-               "GIT_AUTHOR_EMAIL=$author_email",
-               "GIT_AUTHOR_DATE=$commit_date",
-               "GIT_COMMITTER_NAME=$author_name",
-               "GIT_COMMITTER_EMAIL=$author_email",
-               "GIT_COMMITTER_DATE=$commit_date",
                'git-commit-tree', $tree, @commit_args);
 
        # compatibility with git2cvs