Merge branch 'jk/maint-tag-show-fixes' into maint
commita95750c4e8f78eb89c277abd41f05be58715314f
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 07:31:27 +0000 (13 23:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 07:31:27 +0000 (13 23:31 -0800)
tree674f3dca6bd24c1abf98c5d212ea5c5c31c61098
parent801b28a34acc05a4d70643c1905fde71c9d3aee1
parent31fd8d72f2eb82c2b6d8d450ee4e13a3925291c3
Merge branch 'jk/maint-tag-show-fixes' into maint

* 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