Merge branch 'fixes'

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index f35c0d045b3db937e8bf447063c81e869b800f7e..f7c3a515936ac33320c1df3a5f2db71cf3ae3a92 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -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";
 }