diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-06 13:40:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-06 13:40:11 -0700 |
| commit | 921c795c25577e40df1f607a22748332bfb225ea (patch) | |
| tree | e29b9b398d13aeb9b8053f220f584228a87f1b28 /builtin/grep.c | |
| parent | 0785eb769886ae81e346df10e88bc49ffc0ac64e (diff) | |
| parent | 10a0d6ae64ad4fec12ab2c1ed13d1791dde60371 (diff) | |
| download | git-921c795c25577e40df1f607a22748332bfb225ea.tar.gz | |
Merge branch 'jt/add-submodule-odb-clean-up'
More code paths that use the hack to add submodule's object
database to the set of alternate object store have been cleaned up.
* jt/add-submodule-odb-clean-up:
revision: remove "submodule" from opt struct
repository: support unabsorbed in repo_submodule_init
submodule: remove unnecessary unabsorbed fallback
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 51278b01fa..8af5249a7b 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -433,17 +433,14 @@ static int grep_submodule(struct grep_opt *opt, { struct repository *subrepo; struct repository *superproject = opt->repo; - const struct submodule *sub; struct grep_opt subopt; int hit = 0; - sub = submodule_from_path(superproject, null_oid(), path); - if (!is_submodule_active(superproject, path)) return 0; subrepo = xmalloc(sizeof(*subrepo)); - if (repo_submodule_init(subrepo, superproject, sub)) { + if (repo_submodule_init(subrepo, superproject, path, null_oid())) { free(subrepo); return 0; } |