]> granicus.if.org Git - git/commitdiff
Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:43:03 +0000 (08:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:43:03 +0000 (08:43 -0700)
* 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

1  2 
builtin/grep.c
builtin/prune.c
bundle.c
refs.c

diff --cc builtin/grep.c
Simple merge
diff --cc builtin/prune.c
Simple merge
diff --cc bundle.c
Simple merge
diff --cc refs.c
Simple merge