diff options
author | Junio C Hamano <junkio@cox.net> | 2005-10-11 22:04:19 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-10-11 22:04:19 -0700 |
commit | 7882213298f73dde1f9b6908b35211fac1756e7e (patch) | |
tree | b2fc3ad36a839fd432d28ce4eb5b9c8a72c5010c | |
parent | e858862fd967f5d51b0730f8750a49c6acedea3e (diff) | |
parent | df73e9c62a9f0e6cdf20f095b99abf32c8e65c75 (diff) | |
download | git-7882213298f73dde1f9b6908b35211fac1756e7e.tar.gz git-7882213298f73dde1f9b6908b35211fac1756e7e.tar.xz |
Merge branch 'fixes'
-rwxr-xr-x | git-cvsimport.perl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index f35c0d045..f7c3a5159 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 ($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"; } |