Merge branch 'jk/fully-peeled-packed-ref'
commit870987dec752fe2a6752f7813fe1892b5e1a8d32
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 21:01:07 +0000 (25 14:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 21:01:07 +0000 (25 14:01 -0700)
tree64744e8b48696fb0a27411fdd2966dd8c2928d6e
parent4e38e9b1d05fb00ad87cba8c44117a537d779c9e
parentc29c46fa2e21e608ce2e603649af5bf38e7969c2
Merge branch 'jk/fully-peeled-packed-ref'

Not that we do not actively encourage having annotated tags outside
refs/tags/ hierarchy, but they were not advertised correctly to the
ls-remote and fetch with recent version of Git.

* jk/fully-peeled-packed-ref:
  pack-refs: add fully-peeled trait
  pack-refs: write peeled entry for non-tags
  use parse_object_or_die instead of die("bad object")
  avoid segfaults on parse_object failure
builtin/grep.c
builtin/prune.c
bundle.c
refs.c