X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-cvsimport-script;h=c514d14c3f2988dd8d7e3fb415a085d60d05757e;hb=8d0ea3117597933610e02907d14b443f8996ca3b;hp=dffd134e63b2f37fb59631d2884afaa13a7625d3;hpb=a92bebe6978edaea2885a627e7bef6f7f8b208c2;p=git.git

diff --git a/git-cvsimport-script b/git-cvsimport-script
index dffd134e..c514d14c 100755
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -148,6 +148,8 @@ sub conn {
 		my $pw = IO::Pipe->new();
 		my $pid = fork();
 		die "Fork: $!\n" unless defined $pid;
+		my $cvs = 'cvs';
+		$cvs = $ENV{CVS_SERVER} if exists $ENV{CVS_SERVER};
 		unless($pid) {
 			$pr->writer();
 			$pw->reader();
@@ -155,7 +157,7 @@ sub conn {
 			dup2($pr->fileno(),1);
 			$pr->close();
 			$pw->close();
-			exec("cvs","server");
+			exec($cvs,"server");
 		}
 		$pw->writer();
 		$pr->reader();