From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Wed, 19 Oct 2005 07:01:02 +0000 (-0700)
Subject: Fix cvsimport warning when called without --no-cvs-direct
X-Git-Tag: v0.99.8f~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=750a09a7de63c92868cff41a3151eac320c77fa0;p=git.git

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>
---

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index f7c3a515..f00f7596 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);