From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Sep 2013 18:39:59 +0000 (-0700)
Subject: Merge branch 'tb/precompose-autodetect-fix'
X-Git-Tag: v1.8.5-rc0~132
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f2ded0f807da72d2bac8cdb7f332a91f5ea5ee72?ds=inline;hp=-c

Merge branch 'tb/precompose-autodetect-fix'

On MacOS X, we detected if the filesystem needs the "pre-composed
unicode strings" workaround, but did not automatically enable it.
Now we do.

* tb/precompose-autodetect-fix:
Set core.precomposeunicode to true on e.g. HFS+
---

f2ded0f807da72d2bac8cdb7f332a91f5ea5ee72
diff --combined t/t7400-submodule-basic.sh
index 4192fe0ec6,f0f8cde434..10f89bd0ce
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@@ -18,16 -18,6 +18,16 @@@ test_expect_success 'setup - initial co
  	git branch initial
  '
  
 +test_expect_success 'configuration parsing' '
 +	test_when_finished "rm -f .gitmodules" &&
 +	cat >.gitmodules <<-\EOF &&
 +	[submodule "s"]
 +		path
 +		ignore
 +	EOF
 +	test_must_fail git status
 +'
 +
  test_expect_success 'setup - repository in init subdirectory' '
  	mkdir init &&
  	(
@@@ -783,11 -773,13 +783,11 @@@ test_expect_success 'submodule add --na
  			test_cmp expect .git
  		) &&
  		echo "repo" >expect &&
 -		git config -f .gitmodules submodule.repo.path >actual &&
 -		test_cmp expect actual &&
 +		test_must_fail git config -f .gitmodules submodule.repo.path &&
  		git config -f .gitmodules submodule.repo_new.path >actual &&
  		test_cmp expect actual&&
  		echo "$submodurl/repo" >expect &&
 -		git config -f .gitmodules submodule.repo.url >actual &&
 -		test_cmp expect actual &&
 +		test_must_fail git config -f .gitmodules submodule.repo.url &&
  		echo "$submodurl/bare.git" >expect &&
  		git config -f .gitmodules submodule.repo_new.url >actual &&
  		test_cmp expect actual &&
@@@ -807,8 -799,12 +807,8 @@@ test_expect_success 'submodule add wit
  		git rm repo &&
  		test_must_fail git submodule add -q --name repo_new "$submodurl/repo.git" repo &&
  		test ! -d repo &&
 -		echo "repo" >expect &&
 -		git config -f .gitmodules submodule.repo_new.path >actual &&
 -		test_cmp expect actual&&
 -		echo "$submodurl/bare.git" >expect &&
 -		git config -f .gitmodules submodule.repo_new.url >actual &&
 -		test_cmp expect actual &&
 +		test_must_fail git config -f .gitmodules submodule.repo_new.path &&
 +		test_must_fail git config -f .gitmodules submodule.repo_new.url &&
  		echo "$submodurl/bare.git" >expect &&
  		git config submodule.repo_new.url >actual &&
  		test_cmp expect actual &&
@@@ -962,7 -958,6 +962,6 @@@ test_expect_success 'submodule with UTF
  		git add sub &&
  		git commit -m "init sub"
  	) &&
- 	test_config core.precomposeunicode true &&
  	git submodule add ./"$svname" &&
  	git submodule >&2 &&
  	test -n "$(git submodule | grep "$svname")"