Merge branch 'fixes'

git-mirror · Oct 12, 2005 · d06b689 · d06b689
2 parents 128af9d + df73e9c
commit d06b689
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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";
 }