X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-cvsimport.perl;h=76f6246a31b86dd54ca0556f76a8511d73be8ec7;hp=41ee9a608d762718c33594374dfa4cb3205dd4f9;hb=162f41292167a800432fc6bbacfcd9f93a90b0c8;hpb=1af0d11283ee34127a4ee877fb753db021d399ea

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 41ee9a60..76f6246a 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -23,7 +23,7 @@ use File::Basename qw(basename dirname);
 use Time::Local;
 use IO::Socket;
 use IO::Pipe;
-use POSIX qw(strftime dup2 :errno_h);
+use POSIX qw(strftime dup2 ENOENT);
 use IPC::Open2;
 
 $SIG{'PIPE'}="IGNORE";
@@ -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