[PATCH] grep: remove "repo" arg from non-supporting funcs
- From
- Jonathan Tan <jonathantanmy@google.com>
- Date
- Mar 27, 2018, 22:58 UTC
- Message-ID
- <20180327225850.166523-1-jonathantanmy@google.com>
- In-Reply-To
- <20180327213918.77851-3-sbeller@google.com>
As part of commit f9ee2fcdfa ("grep: recurse in-process using 'struct repository'", 2017-08-02), many functions in builtin/grep.c were converted to also take "struct repository *" arguments. Among them were grep_object() and grep_objects().
However, at least grep_objects() was converted incompletely - it calls gitmodules_config_oid(), which references the_repository.
But it turns out that the conversion was extraneous anyway - there has been no user-visible effect - because grep_objects() is never invoked except with the_repository.
Revert the changes to grep_objects() and grep_object() (which conversion is also extraneous) to show that both these functions do not support repositories other than the_repository.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com> --- Patch 1/5 of your series is obviously correct.
I investigated the change to grep_objects() in patch 2/5, and here is a patch summarizing my findings. Consider including this patch before 2/5 (or before 1/5). You'll probably need to write "submodule_free(the_repository);" instead of what you have currently, but other than that, I don't think this affects your patch set much. --- builtin/grep.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c index 789a89133..f286f2375 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -601,8 +601,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec, } static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec, - struct object *obj, const char *name, const char *path, - struct repository *repo) + struct object *obj, const char *name, const char *path) { if (obj->type == OBJ_BLOB) return grep_oid(opt, &obj->oid, name, 0, path); @@ -629,7 +628,7 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec, } init_tree_desc(&tree, data, size); hit = grep_tree(opt, pathspec, &tree, &base, base.len, - obj->type == OBJ_COMMIT, repo); + obj->type == OBJ_COMMIT, the_repository); strbuf_release(&base); free(data); return hit; @@ -638,7 +637,6 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec, } static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec, - struct repository *repo, const struct object_array *list) { unsigned int i; @@ -654,8 +652,8 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec, submodule_free(); gitmodules_config_oid(&real_obj->oid); } - if (grep_object(opt, pathspec, real_obj, list->objects[i].name, list->objects[i].path, - repo)) { + if (grep_object(opt, pathspec, real_obj, list->objects[i].name, + list->objects[i].path)) { hit = 1; if (opt->status_only) break; @@ -1107,7 +1105,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) if (cached) die(_("both --cached and trees are given.")); - hit = grep_objects(&opt, &pathspec, the_repository, &list); + hit = grep_objects(&opt, &pathspec, &list); } if (num_threads)
-- 2.16.0.rc0.35.ga4d78ce26