From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 24 Jan 2009 03:02:41 +0000 (-0800)
Subject: Merge branch 'pb/maint-git-pm-false-dir' into maint
X-Git-Tag: v1.6.1.1~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e5bde1987c1ddaf2416011b9529a73eb174f5d21?ds=inline;hp=-c

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

* pb/maint-git-pm-false-dir:
Git.pm: correctly handle directory name that evaluates to "false"
---

e5bde1987c1ddaf2416011b9529a73eb174f5d21
diff --combined perl/Git.pm
index e9f8c9c048,ad0f530445..7d7f2b1d36
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@@ -166,11 -166,12 +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});
@@@ -1010,8 -1011,8 +1011,8 @@@ sub _temp_cache 
  	my $temp_fd = \$TEMP_FILEMAP{$name};
  	if (defined $$temp_fd and $$temp_fd->opened) {
  		if ($TEMP_FILES{$$temp_fd}{locked}) {
 -			throw Error::Simple("Temp file with moniker '",
 -				$name, "' already in use");
 +			throw Error::Simple("Temp file with moniker '" .
 +				$name . "' already in use");
  		}
  	} else {
  		if (defined $$temp_fd) {