X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-cvsimport.perl;h=bbb83fb71cab2d177e98a1c648974bb2bca4607a;hb=b5c367f75c2990650119749a1add5216871ca47a;hp=cc0eed29463735950b0b0ec41de7197006fc204a;hpb=89764f5d8b0ca8600e3a200e9f863c3c7a3ff5e8;p=git.git

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index cc0eed29..bbb83fb7 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 (defined($opt_p) && $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";
 }
 
@@ -587,7 +590,7 @@ my $commit = sub {
 					push @par, '-p', $mparent;
 					print OUT "Merge parent branch: $mparent\n" if $opt_v;
 				}
-			} 
+			}
 		}
 
 		exec("env",