diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index cc0eed29463735950b0b0ec41de7197006fc204a..0621dc3e2f6d8de2f0019164d57cc8916deb6b98 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
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";
}
push @par, '-p', $mparent;
print OUT "Merge parent branch: $mparent\n" if $opt_v;
}
- }
+ }
}
exec("env",