From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Sep 2014 21:39:44 +0000 (-0700)
Subject: Merge branch 'jc/hash-object-fsck-tag'
X-Git-Tag: v2.2.0-rc0~87
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f190737f225638addbc6695ef27eb926f31bd4e4?ds=inline;hp=-c

Merge branch 'jc/hash-object-fsck-tag'

Using "hash-object --literally", test one of the new breakages
js/fsck-tag-validation topic teaches "fsck" to catch is caught.

* jc/hash-object-fsck-tag:
t1450: make sure fsck detects a malformed tagger line
---

f190737f225638addbc6695ef27eb926f31bd4e4
diff --combined t/t1450-fsck.sh
index c23408ec07,b120a2d79a..019fddd4e8
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@@ -69,7 -69,7 +69,7 @@@ test_expect_success 'object with bad sh
  	git update-ref refs/heads/bogus $cmt &&
  	test_when_finished "git update-ref -d refs/heads/bogus" &&
  
 -	test_might_fail git fsck 2>out &&
 +	test_must_fail git fsck 2>out &&
  	cat out &&
  	grep "$sha.*corrupt" out
  '
@@@ -101,7 -101,7 +101,7 @@@ test_expect_success 'email with embedde
  	test_when_finished "remove_object $new" &&
  	git update-ref refs/heads/bogus "$new" &&
  	test_when_finished "git update-ref -d refs/heads/bogus" &&
 -	git fsck 2>out &&
 +	test_must_fail git fsck 2>out &&
  	cat out &&
  	grep "error in commit $new" out
  '
@@@ -113,7 -113,7 +113,7 @@@ test_expect_success 'missing < email de
  	test_when_finished "remove_object $new" &&
  	git update-ref refs/heads/bogus "$new" &&
  	test_when_finished "git update-ref -d refs/heads/bogus" &&
 -	git fsck 2>out &&
 +	test_must_fail git fsck 2>out &&
  	cat out &&
  	grep "error in commit $new.* - bad name" out
  '
@@@ -125,7 -125,7 +125,7 @@@ test_expect_success 'missing email is r
  	test_when_finished "remove_object $new" &&
  	git update-ref refs/heads/bogus "$new" &&
  	test_when_finished "git update-ref -d refs/heads/bogus" &&
 -	git fsck 2>out &&
 +	test_must_fail git fsck 2>out &&
  	cat out &&
  	grep "error in commit $new.* - missing email" out
  '
@@@ -137,7 -137,7 +137,7 @@@ test_expect_success '> in name is repor
  	test_when_finished "remove_object $new" &&
  	git update-ref refs/heads/bogus "$new" &&
  	test_when_finished "git update-ref -d refs/heads/bogus" &&
 -	git fsck 2>out &&
 +	test_must_fail git fsck 2>out &&
  	cat out &&
  	grep "error in commit $new" out
  '
@@@ -151,31 -151,11 +151,31 @@@ test_expect_success 'integer overflow i
  	test_when_finished "remove_object $new" &&
  	git update-ref refs/heads/bogus "$new" &&
  	test_when_finished "git update-ref -d refs/heads/bogus" &&
 -	git fsck 2>out &&
 +	test_must_fail git fsck 2>out &&
  	cat out &&
  	grep "error in commit $new.*integer overflow" out
  '
  
 +test_expect_success 'malformatted tree object' '
 +	test_when_finished "git update-ref -d refs/tags/wrong" &&
 +	test_when_finished "remove_object \$T" &&
 +	T=$(
 +		GIT_INDEX_FILE=test-index &&
 +		export GIT_INDEX_FILE &&
 +		rm -f test-index &&
 +		>x &&
 +		git add x &&
 +		T=$(git write-tree) &&
 +		(
 +			git cat-file tree $T &&
 +			git cat-file tree $T
 +		) |
 +		git hash-object -w -t tree --stdin
 +	) &&
 +	test_must_fail git fsck 2>out &&
 +	grep "error in tree .*contains duplicate file entries" out
 +'
 +
  test_expect_success 'tag pointing to nonexistent' '
  	cat >invalid-tag <<-\EOF &&
  	object ffffffffffffffffffffffffffffffffffffffff
@@@ -233,6 -213,25 +233,25 @@@ test_expect_success 'tag with incorrec
  	grep "expected .tagger. line" out
  '
  
+ test_expect_success 'tag with bad tagger' '
+ 	sha=$(git rev-parse HEAD) &&
+ 	cat >wrong-tag <<-EOF &&
+ 	object $sha
+ 	type commit
+ 	tag not-quite-wrong
+ 	tagger Bad Tagger Name
+ 
+ 	This is an invalid tag.
+ 	EOF
+ 
+ 	tag=$(git hash-object --literally -t tag -w --stdin <wrong-tag) &&
+ 	test_when_finished "remove_object $tag" &&
+ 	echo $tag >.git/refs/tags/wrong &&
+ 	test_when_finished "git update-ref -d refs/tags/wrong" &&
+ 	test_must_fail git fsck --tags 2>out &&
+ 	grep "error in tag .*: invalid author/committer" out
+ '
+ 
  test_expect_success 'cleaned up' '
  	git fsck >actual 2>&1 &&
  	test_cmp empty actual
@@@ -321,60 -320,4 +340,60 @@@ test_expect_success 'fsck notices ".git
  	)
  '
  
 +# 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).
 +create_repo_missing () {
 +	rm -rf missing &&
 +	git init missing &&
 +	(
 +		cd missing &&
 +		git commit -m one --allow-empty &&
 +		mkdir subdir &&
 +		echo content >subdir/file &&
 +		git add subdir/file &&
 +		git commit -m two &&
 +		unrelated=$(echo unrelated | git hash-object --stdin -w) &&
 +		git tag -m foo tag $unrelated &&
 +		sha1=$(git rev-parse --verify "$1") &&
 +		path=$(echo $sha1 | sed 's|..|&/|') &&
 +		rm .git/objects/$path
 +	)
 +}
 +
 +test_expect_success 'fsck notices missing blob' '
 +	create_repo_missing HEAD:subdir/file &&
 +	test_must_fail git -C missing fsck
 +'
 +
 +test_expect_success 'fsck notices missing subtree' '
 +	create_repo_missing HEAD:subdir &&
 +	test_must_fail git -C missing fsck
 +'
 +
 +test_expect_success 'fsck notices missing root tree' '
 +	create_repo_missing HEAD^{tree} &&
 +	test_must_fail git -C missing fsck
 +'
 +
 +test_expect_success 'fsck notices missing parent' '
 +	create_repo_missing HEAD^ &&
 +	test_must_fail git -C missing fsck
 +'
 +
 +test_expect_success 'fsck notices missing tagged object' '
 +	create_repo_missing tag^{blob} &&
 +	test_must_fail git -C missing fsck
 +'
 +
 +test_expect_success 'fsck notices ref pointing to missing commit' '
 +	create_repo_missing HEAD &&
 +	test_must_fail git -C missing fsck
 +'
 +
 +test_expect_success 'fsck notices ref pointing to missing tag' '
 +	create_repo_missing tag &&
 +	test_must_fail git -C missing fsck
 +'
 +
  test_done