diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-02-05 00:48:34 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-25 17:16:32 -0800 |
| commit | 6aea6baeb3ece6c832dbdf1deed09f41aebf85c2 (patch) | |
| tree | bcfb7909cdbe80e78dbe3cc4281b1a7a777a473b /builtin/grep.c | |
| parent | object-file.c: add a literal version of write_object_file_prepare() (diff) | |
| download | git-6aea6baeb3ece6c832dbdf1deed09f41aebf85c2.tar.gz git-6aea6baeb3ece6c832dbdf1deed09f41aebf85c2.zip | |
object-file API: pass an enum to read_object_with_reference()
Change the read_object_with_reference() function to take an "enum
object_type". It was not prepared to handle an arbitrary "const
char *type", as it was itself calling type_from_string().
Let's change the only caller that passes in user data to use
type_from_string(), and convert the rest to use e.g. "OBJ_TREE"
instead of "tree_type".
The "cat-file" caller is not on the codepath that
handles"--allow-unknown", so the type_from_string() there is safe. Its
use of type_from_string() doesn't functionally differ from that of the
pre-image.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 9e34a820ad..75e07b5623 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -482,7 +482,7 @@ static int grep_submodule(struct grep_opt *opt, object_type = oid_object_info(subrepo, oid, NULL); obj_read_unlock(); data = read_object_with_reference(subrepo, - oid, tree_type, + oid, OBJ_TREE, &size, NULL); if (!data) die(_("unable to read tree (%s)"), oid_to_hex(oid)); @@ -651,7 +651,7 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec, int hit, len; data = read_object_with_reference(opt->repo, - &obj->oid, tree_type, + &obj->oid, OBJ_TREE, &size, NULL); if (!data) die(_("unable to read tree (%s)"), oid_to_hex(&obj->oid)); |