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
This commit is contained in:
@ -820,9 +820,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
|
||||
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);
|
||||
add_object_array(object, arg, &list);
|
||||
continue;
|
||||
}
|
||||
|
Reference in New Issue
Block a user