Merge branch 'jk/maint-tag-show-fixes' into next
commit18459c49379591735ba1fe33bf4e163f94c3c5a2
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Feb 2012 04:45:56 +0000 (8 20:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Feb 2012 04:45:56 +0000 (8 20:45 -0800)
tree1130d605f43eec8bd76d8bc175841af77923a156
parenta9abbca82503bf9c276b94bc6709df9da6fb15c1
parent31fd8d72f2eb82c2b6d8d450ee4e13a3925291c3
Merge branch 'jk/maint-tag-show-fixes' into next

* 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
builtin/tag.c
t/t7004-tag.sh