From: Matthias Urlichs <smurf@kiste.(none)>
Date: Thu, 30 Jun 2005 20:54:01 +0000 (+0200)
Subject: cvsimport: Added option '-p': pass options to cvsps
X-Git-Tag: v0.99~71^2^2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2be4fcc345b03910d1a7bf96f640cde4dcacbd6e;p=git.git

cvsimport: Added option '-p': pass options to cvsps
           Added option '-x' to cvsps call
---

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 1151fb8c0..7ee8845a3 100755
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -26,18 +26,19 @@ use POSIX qw(strftime dup2);
 $SIG{'PIPE'}="IGNORE";
 $ENV{'TZ'}="UTC";
 
-our($opt_h,$opt_o,$opt_v,$opt_d);
+our($opt_h,$opt_o,$opt_v,$opt_d,$opt_p);
 
 sub usage() {
 	print STDERR <<END;
 Usage: ${\basename $0}     # fetch/update GIT from CVS
 	   [ -o branch-for-HEAD ] [ -h ] [ -v ] [ -d CVSROOT ]
+       [ -p opts-for-cvsps ]
        CVS_module [ GIT_repository ]
 END
 	exit(1);
 }
 
-getopts("hqvo:d:") or usage();
+getopts("hqvo:d:p:") or usage();
 usage if $opt_h;
 
 @ARGV == 1 or @ARGV == 2 or usage();
@@ -375,7 +376,9 @@ unless(-d $git_dir) {
 my $pid = open(CVS,"-|");
 die "Cannot fork: $!\n" unless defined $pid;
 unless($pid) {
-	exec("cvsps","-A","--cvs-direct",$cvs_tree);
+	my @opt;
+	@opt = split(/,/,$opt_p) if defined $opt_p;
+	exec("cvsps",@opt,"-x","-A","--cvs-direct",$cvs_tree);
 	die "Could not start cvsps: $!\n";
 }