summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-07-30 21:34:30 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-07-30 21:34:30 -0700
commitadd0a35caad3a4309362ae41cb02dae901363f87 (patch)
tree68f575eb188f1967fb1711bc1050aa002179f770 /builtin
parentMerge branch 'ar/help-guides-doc' into master (diff)
parentgrep: avoid using oid_to_hex() with parse_object_or_die() (diff)
downloadtgif-add0a35caad3a4309362ae41cb02dae901363f87.tar.xz
Merge branch 'rs/grep-simpler-parse-object-or-die-call' into master
* rs/grep-simpler-parse-object-or-die-call: grep: avoid using oid_to_hex() with parse_object_or_die()
Diffstat (limited to 'builtin')
-rw-r--r--builtin/grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c
index a5056f395a..5975cf5ef2 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -466,7 +466,7 @@ static int grep_submodule(struct grep_opt *opt,
struct strbuf base = STRBUF_INIT;
obj_read_lock();
- object = parse_object_or_die(oid, oid_to_hex(oid));
+ object = parse_object_or_die(oid, NULL);
obj_read_unlock();
data = read_object_with_reference(&subrepo,
&object->oid, tree_type,