X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-cvsimport.perl;h=bbb83fb71cab2d177e98a1c648974bb2bca4607a;hb=f0243f26f6d8403cd8e83c7d498c81e01a1f1735;hp=0621dc3e2f6d8de2f0019164d57cc8916deb6b98;hpb=f865a2ad981f72423aa1c19412ce57c543801957;p=git.git diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 0621dc3e..bbb83fb7 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -487,7 +487,7 @@ unless($pid) { 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);