From df73e9c62a9f0e6cdf20f095b99abf32c8e65c75 Mon Sep 17 00:00:00 2001 From: Martin Langhoff Date: Tue, 11 Oct 2005 21:57:04 -0700 Subject: [PATCH] [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 --- git-cvsimport.perl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git-cvsimport.perl b/git-cvsimport.perl index f35c0d045b..f7c3a51593 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"; }