]> git.ipfire.org Git - thirdparty/git.git/commitdiff
grep: avoid using oid_to_hex() with parse_object_or_die()
authorRené Scharfe <l.s.r@web.de>
Tue, 28 Jul 2020 21:40:38 +0000 (23:40 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Jul 2020 22:26:12 +0000 (15:26 -0700)
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 <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/grep.c

index a5056f395aae16e21b032592558f4389b6953294..5975cf5ef2b07bbe62be8f7c042b240fc29548fd 100644 (file)
@@ -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,