[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us
- From
- Martin Langhoff <martin@catalyst.net.nz>
- Date
- Oct 12, 2005, 03:18 UTC
- Message-ID
- <11290871353300-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 <martin@catalyst.net.nz>
---
git-cvsimport.perl | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
applies-to: c3f42ea5a9df4c1c520b0f32d4e3808d4f000ed7 35587b31ee78ae96a54b10107c5ea3ce21eaa6b1
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index f35c0d0..f7c3a51 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"; } --- 0.99.8.GIT