diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-29 12:47:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-29 12:47:54 -0800 |
| commit | 5d3635db19c6dff4fb063fabfa4161fd3b8285f0 (patch) | |
| tree | 30671c79e96d06267eda7d088a4ef7fd86c3ad47 /builtin/submodule--helper.c | |
| parent | f33989464ecfc05a937328430b7e74819f7285dd (diff) | |
| parent | be76c2128234d94b47f7087152ee55d08bb65d88 (diff) | |
| download | git-5d3635db19c6dff4fb063fabfa4161fd3b8285f0.tar.gz | |
Merge branch 'sb/submodule-recursive-fetch-gets-the-tip'
"git fetch --recurse-submodules" may not fetch the necessary commit
that is bound to the superproject, which is getting corrected.
* sb/submodule-recursive-fetch-gets-the-tip:
fetch: ensure submodule objects fetched
submodule.c: fetch in submodules git directory instead of in worktree
submodule: migrate get_next_submodule to use repository structs
repository: repo_submodule_init to take a submodule struct
submodule: store OIDs in changed_submodule_names
submodule.c: tighten scope of changed_submodule_names struct
submodule.c: sort changed_submodule_names before searching it
submodule.c: fix indentation
sha1-array: provide oid_array_filter
Diffstat (limited to 'builtin/submodule--helper.c')
| -rw-r--r-- | builtin/submodule--helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 6881b6a9cb..0e140f176c 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2056,7 +2056,7 @@ static int ensure_core_worktree(int argc, const char **argv, const char *prefix) if (!sub) BUG("We could get the submodule handle before?"); - if (repo_submodule_init(&subrepo, the_repository, path)) + if (repo_submodule_init(&subrepo, the_repository, sub)) die(_("could not get a repository handle for submodule '%s'"), path); if (!repo_config_get_string(&subrepo, "core.worktree", &cw)) { |