[PATCH] builtin/grep.c: remote superflous submodule code
- Date: Fri, 5 Oct 2018 15:45:57 -0700
- From: Stefan Beller <sbeller@xxxxxxxxxx>
- Subject: [PATCH] builtin/grep.c: remote superflous submodule code
In f9ee2fcdfa (grep: recurse in-process using 'struct repository',
2017-08-02), we introduced a call to repo_read_gitmodules in builtin/grep
to simplify the submodule handling.
After ff6f1f564c4 (submodule-config: lazy-load a repository's .gitmodules
file, 2017-08-03) this is no longer necessary, but that commit did not
cleanup the whole tree, but just show cased the new way how to deal with
submodules in ls-files.
Cleanup the only remaining caller to repo_read_gitmodules outside of
Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
Antonio Ospite writes:
> BTW, with Stefan Beller we also identified some unneeded code which
> could have been removed to alleviate the issue, but that would not have
> solved it completely; so, I am not removing the unnecessary call to
> repo_read_gitmodules() builtin/grep.c in this series, possibly this can
> become a stand-alone change.
Here is the stand-alone change.
The patch  contains the lines as deleted below in the context lines
but they would not conflict as there is one empty line between the changes
in this patch in .
builtin/grep.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 601f801158..a6272b9c2f 100644
@@ -427,8 +427,6 @@ static int grep_submodule(struct grep_opt *opt, struct repository *superproject,
if (repo_submodule_init(&submodule, superproject, path))
* NEEDSWORK: This adds the submodule's object directory to the list of
* alternates for the single in-memory object store. This has some bad