From: René Scharfe Date: Tue, 28 Jul 2020 21:40:38 +0000 (+0200) Subject: grep: avoid using oid_to_hex() with parse_object_or_die() X-Git-Tag: v2.29.0-rc0~203^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98c6871fad0be42fbe045de2338d0a5bdbc5af1d;p=thirdparty%2Fgit.git grep: avoid using oid_to_hex() with parse_object_or_die() parse_object_or_die() is passed an object ID and a name to show if the object cannot be parsed. If the name is NULL then it shows the hexadecimal object ID. Use that feature instead of preparing and passing the hexadecimal representation to the function proactively. That's shorter and a bit more efficient. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano --- 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,