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/ls-files.c | |
| parent | The tenth batch (diff) | |
| parent | revision: remove "submodule" from opt struct (diff) | |
| download | tgif-921c795c25577e40df1f607a22748332bfb225ea.tar.xz | |
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/ls-files.c')
| -rw-r--r-- | builtin/ls-files.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index e6d415e077..a2000ed6bf 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -209,10 +209,8 @@ static void show_submodule(struct repository *superproject, struct dir_struct *dir, const char *path) { struct repository subrepo; - const struct submodule *sub = submodule_from_path(superproject, - null_oid(), path); - if (repo_submodule_init(&subrepo, superproject, sub)) + if (repo_submodule_init(&subrepo, superproject, path, null_oid())) return; if (repo_read_index(&subrepo) < 0) |