Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1
commitf1ad05f3a524a8750533d8263ceb584a9e7ec573
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:43:03 +0000 (3 08:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:43:03 +0000 (3 08:43 -0700)
tree9a7c452694f2718b34ddebf32aacf5a373203d5c
parent8f780ca9be58d748c79e11b8dccad9474f4d1a19
parentc29c46fa2e21e608ce2e603649af5bf38e7969c2
Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1

* 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