Re: [PATCH 0/9] Resending sb/submodule-recursive-fetch-gets-the-tip
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 18, 2018, 07:30 UTC
- Message-ID
- <xmqqa7nb67a2.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20181016181327.107186-1-sbeller@google.com>
Stefan Beller <sbeller@google.com> writes:
Show 5 quoted lines
> This is based on ao/submodule-wo-gitmodules-checked-out. > > This resends origin/sb/submodule-recursive-fetch-gets-the-tip, resolving > the issues pointed out via origin/xxx/sb-submodule-recursive-fetch-gets-the-tip-in-pu > by basing this series on origin/ao/submodule-wo-gitmodules-checked-out
Applying this round to the result of merging ao/submodule-* to 'master' requires this to work, it seems, as you've introduced a call to repo-init thing in the meantime with another topic.
Subject: [PATCH] fixup! repository: repo_submodule_init to take a submodule struct
--- builtin/submodule--helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 5f8a804a6e..015aa1471f 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2037,7 +2037,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)) {
-- 2.19.1-450-ga4b8ab5363