From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Feb 2012 06:42:06 +0000 (-0800)
Subject: Merge branch 'jk/maint-tag-show-fixes'
X-Git-Tag: v1.7.10-rc0~102
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1efb73322ad800cc679496124e8a1f498b52e5cb;p=git.git

Merge branch 'jk/maint-tag-show-fixes'

* jk/maint-tag-show-fixes:
  tag: do not show non-tag contents with "-n"
  tag: die when listing missing or corrupt objects
  tag: fix output of "tag -n" when errors occur

Conflicts:
	t/t7004-tag.sh
---

1efb73322ad800cc679496124e8a1f498b52e5cb
diff --cc t/t7004-tag.sh
index e93ac7382,7687e62cc..4ef79aabc
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@@ -586,6 -585,37 +586,19 @@@ test_expect_success 
  	test_cmp expect actual
  '
  
+ test_expect_success 'annotations for blobs are empty' '
+ 	blob=$(git hash-object -w --stdin <<-\EOF
+ 	Blob paragraph 1.
+ 
+ 	Blob paragraph 2.
+ 	EOF
+ 	) &&
+ 	git tag tag-blob $blob &&
+ 	echo "tag-blob        " >expect &&
+ 	git tag -n1 -l tag-blob >actual &&
+ 	test_cmp expect actual
+ '
+ 
 -# subsequent tests require gpg; check if it is available
 -gpg --version >/dev/null 2>/dev/null
 -if [ $? -eq 127 ]; then
 -	say "# gpg not found - skipping tag signing and verification tests"
 -else
 -	# As said here: http://www.gnupg.org/documentation/faqs.html#q6.19
 -	# the gpg version 1.0.6 didn't parse trust packets correctly, so for
 -	# that version, creation of signed tags using the generated key fails.
 -	case "$(gpg --version)" in
 -	'gpg (GnuPG) 1.0.6'*)
 -		say "Skipping signed tag tests, because a bug in 1.0.6 version"
 -		;;
 -	*)
 -		test_set_prereq GPG
 -		;;
 -	esac
 -fi
 -
  # trying to verify annotated non-signed tags:
  
  test_expect_success GPG \