Merge branch 'pb/maint-git-pm-false-dir' into maint

gitster · gitster · commit e5bde1987c1d · 2009-01-23T19:02:41.000-08:00
* pb/maint-git-pm-false-dir:
  Git.pm: correctly handle directory name that evaluates to "false"
diff --git a/perl/Git.pm b/perl/Git.pm
@@ -166,11 +166,12 @@ sub repository {
 		}
 	}
 
-	if (not defined $opts{Repository} and not defined $opts{WorkingCopy}) {
-		$opts{Directory} ||= '.';
+	if (not defined $opts{Repository} and not defined $opts{WorkingCopy}
+		and not defined $opts{Directory}) {
+		$opts{Directory} = '.';
 	}
 
-	if ($opts{Directory}) {
+	if (defined $opts{Directory}) {
 		-d $opts{Directory} or throw Error::Simple("Directory not found: $!");
 
 		my $search = Git->repository(WorkingCopy => $opts{Directory});

Original file line number	Diff line number	Diff line change
`@@ -166,11 +166,12 @@ sub repository {`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
`169`		`- if (not defined $opts{Repository} and not defined $opts{WorkingCopy}) {`
`170`		`- $opts{Directory} \|\|= '.';`
	`169`	`+ if (not defined $opts{Repository} and not defined $opts{WorkingCopy}`
	`170`	`+ and not defined $opts{Directory}) {`
	`171`	`+ $opts{Directory} = '.';`
`171`	`172`	`}`
`172`	`173`
`173`		`- if ($opts{Directory}) {`
	`174`	`+ if (defined $opts{Directory}) {`
`174`	`175`	`-d $opts{Directory} or throw Error::Simple("Directory not found: $!");`
`175`	`176`
`176`	`177`	`my $search = Git->repository(WorkingCopy => $opts{Directory});`