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

Martin Langhoff · Junio C Hamano · commit df73e9c62a9f · 2005-10-11T21:57:04.000-07:00
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 &lt;martin@catalyst.net.nz&gt;
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
@@ -487,7 +487,10 @@ ($$)
 	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";
 }
 
