From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Jan 2015 21:28:29 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v2.3.0-rc0~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ee6e4c70f1b0126edc7fbff4600bbfb74444e6ba?ds=inline;hp=-c

Merge branch 'maint'

* maint:
is_hfs_dotgit: loosen over-eager match of \u{..47}
---

ee6e4c70f1b0126edc7fbff4600bbfb74444e6ba
diff --combined t/t1450-fsck.sh
index 1f04b8aa3f,793aee9f0b..cfb32b6242
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@@ -229,12 -229,8 +229,12 @@@ test_expect_success 'tag with incorrec
  	echo $tag >.git/refs/tags/wrong &&
  	test_when_finished "git update-ref -d refs/tags/wrong" &&
  	git fsck --tags 2>out &&
 -	grep "invalid .tag. name" out &&
 -	grep "expected .tagger. line" out
 +
 +	cat >expect <<-EOF &&
 +	warning in tag $tag: invalid '\''tag'\'' name: wrong name format
 +	warning in tag $tag: invalid format - expected '\''tagger'\'' line
 +	EOF
 +	test_cmp expect out
  '
  
  test_expect_success 'tag with bad tagger' '
@@@ -349,6 -345,21 +349,21 @@@ dot-backslash-case .\\\\.GIT\\\\fooba
  dotgit-case-backslash .git\\\\foobar
  EOF
  
+ test_expect_success 'fsck allows .Ňit' '
+ 	(
+ 		git init not-dotgit &&
+ 		cd not-dotgit &&
+ 		echo content >file &&
+ 		git add file &&
+ 		git commit -m base &&
+ 		blob=$(git rev-parse :file) &&
+ 		printf "100644 blob $blob\t.\\305\\207it" >tree &&
+ 		tree=$(git mktree <tree) &&
+ 		git fsck 2>err &&
+ 		test_line_count = 0 err
+ 	)
+ '
+ 
  # create a static test repo which is broken by omitting
  # one particular object ($1, which is looked up via rev-parse
  # in the new repository).