From: Junio C Hamano Date: Mon, 21 May 2007 16:38:49 GMT Subject: Re: [PATCH 1/3] t9400: Add test cases for config file handling Message-ID: <7vtzu6dtd2.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20070521163145.GM4085@planck.djpig.de> Frank Lichtenheld writes: > On Sun, May 20, 2007 at 05:57:27PM -0700, Junio C Hamano wrote: >> This part seems to fail for me and gets an "unexpected cvs success". > > Note the note in the patch ;) > >> diff --git a/git-cvsserver.perl b/git-cvsserver.perl >> index fcfb99d..1de5177 100755 >> --- a/git-cvsserver.perl >> +++ b/git-cvsserver.perl >> @@ -192,11 +192,9 @@ sub req_Root >> } >> } >> >> - unless ( ($cfg->{gitcvs}{$state->{method}}{enabled} >> - and $cfg->{gitcvs}{$state->{method}}{enabled} =~ /^\s*(1|true|yes)\s*$/i) >> - or ($cfg->{gitcvs}{enabled} >> - and $cfg->{gitcvs}{enabled} =~ /^\s*(1|true|yes)\s*$/i) ) >> - { >> + my $enabled = ($cfg->{gitcvs}{$state->{method}}{enabled} >> + || $cfg->{gitcvs}{enabled}); >> + unless ($enabled && $enabled =~ /^\s*(1|true|yes)\s*$/i) { >> print "E GITCVS emulation needs to be enabled on this repo\n"; >> print "E the repo config file needs a [gitcvs] section added, and the parameter 'enabled' set to 1\n"; >> print "E \n"; > > Yeah, should probably have fixed that myself before sending, but the > other patches were already prepared ;) Ok, so that's an Ack?