From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Philippe Bruhat (BooK)" Subject: [PATCH] Git.pm: let a false Directory parameter be used correctly by the constructor Date: Fri, 2 Jan 2009 09:49:30 +0100 Message-ID: <1230886170-24188-1-git-send-email-book@cpan.org> Cc: gitster@pobox.com, "Philippe Bruhat (BooK)" To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Jan 02 09:50:56 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LIfk7-0005e3-LY for gcvg-git-2@gmane.org; Fri, 02 Jan 2009 09:50:56 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752943AbZABIte (ORCPT ); Fri, 2 Jan 2009 03:49:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752279AbZABIte (ORCPT ); Fri, 2 Jan 2009 03:49:34 -0500 Received: from zlonk.bruhat.net ([91.121.102.217]:35900 "EHLO ks354402.kimsufi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751501AbZABIte (ORCPT ); Fri, 2 Jan 2009 03:49:34 -0500 Received: from localhost ([127.0.0.1] helo=plop) by ks354402.kimsufi.com with esmtp (Exim 4.63) (envelope-from ) id 1LIfeJ-0006o7-LJ; Fri, 02 Jan 2009 09:44:55 +0100 Received: from book by plop with local (Exim 4.69) (envelope-from ) id 1LIfik-0006IY-Hc; Fri, 02 Jan 2009 09:49:30 +0100 X-Mailer: git-send-email 1.6.0.3.517.g759a Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The repository constructor mistakenly rewrote a Directory parameter that Perl happens to evaluate to false (e.g. "0") to ".". Signed-off-by: Philippe Bruhat (BooK) --- perl/Git.pm | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/perl/Git.pm b/perl/Git.pm index 8392a68..ad0f530 100644 --- 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}); -- 1.6.0.3.517.g759a