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

diff --cc builtin/grep.c
index 8025964987553b8f1ef21b8319b2085d6d31bb0c,08ea5fdec844604e6a48b9a5f6c7bbc74df651dc..159e65d47a41b56634bc3fb480f9c051d40e692c
--- 1/builtin/grep.c
--- 2/builtin/grep.c
+++ b/builtin/grep.c
@@@ -820,11 -898,7 +820,9 @@@ int cmd_grep(int argc, const char **arg
                unsigned char sha1[20];
                /* Is it a rev? */
                if (!get_sha1(arg, sha1)) {
-                       struct object *object = parse_object(sha1);
-                       if (!object)
-                               die(_("bad object %s"), arg);
+                       struct object *object = parse_object_or_die(sha1, arg);
 +                      if (!seen_dashdash)
 +                              verify_non_filename(prefix, arg);
                        add_object_array(object, arg, &list);
                        continue;
                }

diff --cc builtin/prune.c
Simple merge

diff --cc bundle.c
Simple merge

diff --cc refs.c
Simple merge