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/submodule--helper.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/submodule--helper.c')
| -rw-r--r-- | builtin/submodule--helper.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index f8fb70c826..e5855539ac 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2760,7 +2760,6 @@ static int push_check(int argc, const char **argv, const char *prefix) static int ensure_core_worktree(int argc, const char **argv, const char *prefix) { - const struct submodule *sub; const char *path; const char *cw; struct repository subrepo; @@ -2770,11 +2769,7 @@ static int ensure_core_worktree(int argc, const char **argv, const char *prefix) path = argv[1]; - sub = submodule_from_path(the_repository, null_oid(), path); - if (!sub) - BUG("We could get the submodule handle before?"); - - if (repo_submodule_init(&subrepo, the_repository, sub)) + if (repo_submodule_init(&subrepo, the_repository, path, null_oid())) die(_("could not get a repository handle for submodule '%s'"), path); if (!repo_config_get_string_tmp(&subrepo, "core.worktree", &cw)) { |