From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Dec 2010 22:45:28 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/853563d7344ee532aa56f8a9aabcfdfb5c4fe2c3?ds=inline;hp=-c

Merge branch 'maint'

* maint:
t0050: fix printf format strings for portability
t3419-*.sh: Fix arithmetic expansion syntax error
---

853563d7344ee532aa56f8a9aabcfdfb5c4fe2c3
diff --combined t/t0050-filesystem.sh
index 057c97c49f,07357ee1fc..1542cf6a13
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@@ -4,22 -4,22 +4,22 @@@ test_description='Various filesystem is
  
  . ./test-lib.sh
  
- auml=`printf '\xc3\xa4'`
- aumlcdiar=`printf '\x61\xcc\x88'`
+ auml=$(printf '\303\244')
+ aumlcdiar=$(printf '\141\314\210')
  
  case_insensitive=
  unibad=
  no_symlinks=
  test_expect_success 'see what we expect' '
  
 -	test_case=test_expect_success
 -	test_unicode=test_expect_success
 +	test_case=test_expect_success &&
 +	test_unicode=test_expect_success &&
  	mkdir junk &&
  	echo good >junk/CamelCase &&
  	echo bad >junk/camelcase &&
  	if test "$(cat junk/CamelCase)" != good
  	then
 -		test_case=test_expect_failure
 +		test_case=test_expect_failure &&
  		case_insensitive=t
  	fi &&
  	rm -fr junk &&
@@@ -27,7 -27,7 +27,7 @@@
  	>junk/"$auml" &&
  	case "$(cd junk && echo *)" in
  	"$aumlcdiar")
 -		test_unicode=test_expect_failure
 +		test_unicode=test_expect_failure &&
  		unibad=t
  		;;
  	*)	;;
@@@ -36,7 -36,7 +36,7 @@@
  	{
  		ln -s x y 2> /dev/null &&
  		test -h y 2> /dev/null ||
 -		no_symlinks=1
 +		no_symlinks=1 &&
  		rm -f y
  	}
  '
@@@ -128,7 -128,7 +128,7 @@@ test_expect_success "setup unicode norm
    cd unicode &&
    touch "$aumlcdiar" &&
    git add "$aumlcdiar" &&
 -  git commit -m initial
 +  git commit -m initial &&
    git tag initial &&
    git checkout -b topic &&
    git mv $aumlcdiar tmp &&