diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-22 17:11:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-22 17:11:09 -0700 |
| commit | 6295f87b5f46fcb1037eb12e81afaf0490a00922 (patch) | |
| tree | b57cca00fffcb5ce6ff263685794cdbd0c54e819 /builtin/ls-files.c | |
| parent | 99c99ed8259bf070cd8ae7b51a94904b7cf5c161 (diff) | |
| parent | 10a0d6ae64ad4fec12ab2c1ed13d1791dde60371 (diff) | |
| download | git-6295f87b5f46fcb1037eb12e81afaf0490a00922.tar.gz | |
Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules
* 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 29a26ad8ae..ec19bf54b2 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) |