Re: [PATCH] t1507: change quoting in test_did_you_mean to a more general one

From: Kacper Kornet <draenog@pld-linux.org>
Date: May 6, 2011, 08:51 UTC
Message-ID: <20110506085107.GB3719@camk.edu.pl>
In-Reply-To: <4DC3A685.4080300@drmicha.warpmail.net>

On Fri, May 06, 2011 at 09:43:01AM +0200, Michael J Gruber wrote:

Show 6 quoted lines

> Junio C Hamano venit, vidit, dixit 05.05.2011 22:02:
> > Kacper Kornet <draenog@pld-linux.org> writes:
> >> Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
> >> ---
> >>  t/t1506-rev-parse-diagnosis.sh |    4 ++--
> >>  1 files changed, 2 insertions(+), 2 deletions(-)

Show 5 quoted lines

> >> diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
> >> index 4a6396f..bad09f9 100755
> >> --- a/t/t1506-rev-parse-diagnosis.sh
> >> +++ b/t/t1506-rev-parse-diagnosis.sh
> >> @@ -8,8 +8,8 @@ exec </dev/null

Show 8 quoted lines

> >>  test_did_you_mean ()
> >>  {
> >> -	printf "fatal: Path '$2$3' $4, but not ${5:-'$3'}.\n" >expected &&
> >> -	printf "Did you mean '$1:$2$3'${2:+ aka '$1:./$3'}?\n" >>expected &&
> >> +	printf "fatal: Path '$2$3' $4, but not ${5:-\'$3\'}.\n" >expected &&
> >> +	printf "Did you mean '$1:$2$3'${2:+ aka \'$1:./$3\'}?\n" >>expected &&
> >>  	test_cmp expected error
> >>  }

> >> -- 
> >> 1.7.5

> > [Reference]

> > *1* http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02

> Other than that, I have no objections if this patch makes more shells
> happy and no happy ones unhappy.

> Is your ksh OK with all other tests?

Yes. The only other patch which is applied during our building process is:

diff -ur git-1.7.0.3.orig/t/t1304-default-acl.sh git-1.7.0.3/t/t1304-default-acl .sh --- git-1.7.0.3.orig/t/t1304-default-acl.sh 2010-03-22 01:35:03.000000000 +0 000 +++ git-1.7.0.3/t/t1304-default-acl.sh 2010-03-23 19:53:49.069813289 +0000

@@ -9,6 +9,8 @@
 # => this must come before . ./test-lib.sh
 umask 077

+LOGNAME=$(whoami)
+
 . ./test-lib.sh

 # We need an arbitrary other user give permission to using ACLs. root


But it is specific to our build environment.

-- 
  Kacper Kornet