mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/grep-simpler-parse-object-or-die-call' into master

Browse Source 
* rs/grep-simpler-parse-object-or-die-call:
  grep: avoid using oid_to_hex() with parse_object_or_die()
This commit is contained in:
Junio C Hamano
2020-07-30 21:34:30 -07:00
parent 5942edb4ed 98c6871fad
commit add0a35caa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/grep.c
View File

@ -466,7 +466,7 @@ static int grep_submodule(struct grep_opt *opt,
struct strbuf base = STRBUF_INIT; struct strbuf base = STRBUF_INIT;
obj_read_lock(); obj_read_lock();
object = parse_object_or_die(oid, oid_to_hex(oid)); object = parse_object_or_die(oid, NULL);
obj_read_unlock(); obj_read_unlock();
data = read_object_with_reference(&subrepo, data = read_object_with_reference(&subrepo,
&object->oid, tree_type, &object->oid, tree_type,