summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-10-18 18:35:16 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-18 18:35:16 (GMT)
commite175768954816b00bbbba131ec1c411d2cd66582 (patch)
tree19d6f55a3146e926a99c92a30fda02b6b6bf9536
parent4aaa702794447d9b281dd22fe532fd61e02434e1 (diff)
downloadgit-e175768954816b00bbbba131ec1c411d2cd66582.zip
git-e175768954816b00bbbba131ec1c411d2cd66582.tar.gz
git-e175768954816b00bbbba131ec1c411d2cd66582.tar.bz2
Fix cvsimport warning when called without --no-cvs-direct
Perl was warning that $opt_p was undefined in that case. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-cvsimport.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 0621dc3..bbb83fb 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);