From: Martin Langhoff Date: Wed, 05 Oct 2005 10:46:31 GMT Subject: [PATCH] cvsimport: don't pass --cvs-direct if user options contradict us Message-ID: <11285091911785-git-send-email-martin@catalyst.net.nz> 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 files changed, 4 insertions(+), 1 deletions(-) 35587b31ee78ae96a54b10107c5ea3ce21eaa6b1 diff --git a/git-cvsimport.perl b/git-cvsimport.perl --- 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"; }