{"thread":{"id":"43373","subject":"[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us","startedAt":"2005-10-12T03:18:55Z","lastAt":"2005-10-12T03:18:55Z","messageCount":1,"participants":["Martin Langhoff"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"294545","messageId":"11290871353300-git-send-email-martin@catalyst.net.nz","threadId":"43373","inReplyTo":null,"subject":"[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us","fromName":"Martin Langhoff","fromEmail":"martin@catalyst.net.nz","sentAt":"2005-10-12T03:18:55Z","receivedAt":"2005-10-12T03:18:55Z","isPatch":true,"sender":{"key":"martin@laptop.org","avatar":null},"body":"Detecting if the user passed --no-cvs-direct and don't force the mode.\nIt allows us to support all the protocol that the standard cvs client\nsupports at the snail speed you should expect.\n\nThis only affects the rlog reading stage.\n\nSigned-off-by: Martin Langhoff <martin@catalyst.net.nz>\n\n\n---\n\n git-cvsimport.perl |    5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\napplies-to: c3f42ea5a9df4c1c520b0f32d4e3808d4f000ed7\n35587b31ee78ae96a54b10107c5ea3ce21eaa6b1\ndiff --git a/git-cvsimport.perl b/git-cvsimport.perl\nindex f35c0d0..f7c3a51 100755\n--- a/git-cvsimport.perl\n+++ b/git-cvsimport.perl\n@@ -487,7 +487,10 @@ unless($pid) {\n \tmy @opt;\n \t@opt = split(/,/,$opt_p) if defined $opt_p;\n \tunshift @opt, '-z', $opt_z if defined $opt_z;\n-\texec(\"cvsps\",@opt,\"-u\",\"-A\",\"--cvs-direct\",'--root',$opt_d,$cvs_tree);\n+\tunless ($opt_p =~ m/--no-cvs-direct/) {\n+\t\tpush @opt, '--cvs-direct';\n+\t}\n+\texec(\"cvsps\",@opt,\"-u\",\"-A\",'--root',$opt_d,$cvs_tree);\n \tdie \"Could not start cvsps: $!\\n\";\n }\n \n---\n0.99.8.GIT\n\n"}]}