From: Martin Langhoff <martin@catalyst.net.nz>
Date: Wed, 12 Oct 2005 04:57:04 +0000 (-0700)
Subject: [PATCH] cvsimport: don't pass --cvs-direct if user options contradict us
X-Git-Tag: v0.99.8d~8^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df73e9c62a9f0e6cdf20f095b99abf32c8e65c75;p=git.git

[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us

Detecting if the user passed --no-cvs-direct and don't force the mode.
It allows us to support all the protocol that the standard cvs client
supports at the snail speed you should expect.

This only affects the rlog reading stage.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
---

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index f35c0d045..f7c3a5159 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -487,7 +487,10 @@ unless($pid) {
 	my @opt;
 	@opt = split(/,/,$opt_p) if defined $opt_p;
 	unshift @opt, '-z', $opt_z if defined $opt_z;
-	exec("cvsps",@opt,"-u","-A","--cvs-direct",'--root',$opt_d,$cvs_tree);
+	unless ($opt_p =~ m/--no-cvs-direct/) {
+		push @opt, '--cvs-direct';
+	}
+	exec("cvsps",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
 	die "Could not start cvsps: $!\n";
 }