revised^2: git-daemon extra paranoia, and path DWIM

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 0621dc3e2f6d8de2f0019164d57cc8916deb6b98..bbb83fb71cab2d177e98a1c648974bb2bca4607a 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -487,7 +487,7 @@ ($$)
        my @opt;
        @opt = split(/,/,$opt_p) if defined $opt_p;
        unshift @opt, '-z', $opt_z if defined $opt_z;
-       unless ($opt_p =~ m/--no-cvs-direct/) {
+       unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) {
                push @opt, '--cvs-direct';
        }
        exec("cvsps",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);