projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
128af9d
)
Merge branch 'fixes'
author
Junio C Hamano
<junkio@cox.net>
Wed, 12 Oct 2005 05:04:11 +0000
(22:04 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 12 Oct 2005 05:04:11 +0000
(22:04 -0700)
git-cvsimport.perl
patch
|
blob
|
history
diff --git
a/git-cvsimport.perl
b/git-cvsimport.perl
index
f35c0d0
..
f7c3a51
100755
(executable)
--- 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";
}