From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Mar 2013 21:01:07 +0000 (-0700)
Subject: Merge branch 'jk/fully-peeled-packed-ref'
X-Git-Tag: v1.8.3-rc0~171
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=870987dec752fe2a6752f7813fe1892b5e1a8d32;p=git

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
---

870987dec752fe2a6752f7813fe1892b5e1a8d32
diff --cc builtin/grep.c
index 8025964987,08ea5fdec8..159e65d47a
--- a/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;
  		}