Skip to content

Commit

Permalink
[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Martin Langhoff authored and Junio C Hamano committed Oct 12, 2005
1 parent 18e410f commit df73e9c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion git-cvsimport.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}

Expand Down

0 comments on commit df73e9c

Please sign in to comment.