| Message ID | 20181016181327.107186-1-sbeller@google.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Resending sb/submodule-recursive-fetch-gets-the-tip | expand |
Stefan Beller <sbeller@google.com> writes: > This is based on ao/submodule-wo-gitmodules-checked-out. Thanks. I had an impression that we were not entirely happy with the topic and are expecting a reroll, but let's hope that the part we expect to be updated won't have much overlaps. > A range-diff below shows how picking a different base changed the patches, > apart from that no further adjustments have been made. Thanks. Let's see how well this plays together with other topics in 'pu'.q
Stefan Beller <sbeller@google.com> writes: > 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)) {
On Thu, Oct 18, 2018 at 12:30 AM Junio C Hamano <gitster@pobox.com> wrote: > > Stefan Beller <sbeller@google.com> writes: > > > 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. Unfortunately, yes, sb/submodule-update-in-c had one such call. > > This is based on ao/submodule-wo-gitmodules-checked-out. > Thanks. I had an impression that we were not entirely happy with > the topic and are expecting a reroll, but let's hope that the part > we expect to be updated won't have much overlaps. I slowly came to the realization that this topic might be ripped up into 2 or more topics, as some of the cleanups seem to be orthogonal.
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 A range-diff below shows how picking a different base changed the patches, apart from that no further adjustments have been made. Thanks, Stefan Stefan Beller (9): sha1-array: provide oid_array_filter submodule.c: fix indentation submodule.c: sort changed_submodule_names before searching it submodule.c: move global changed_submodule_names into fetch submodule struct submodule.c: do not copy around submodule list repository: repo_submodule_init to take a submodule struct submodule: fetch in submodules git directory instead of in worktree fetch: retry fetching submodules if needed objects were not fetched builtin/fetch: check for submodule updates for non branch fetches Documentation/technical/api-oid-array.txt | 5 + builtin/fetch.c | 14 +- builtin/grep.c | 17 +- builtin/ls-files.c | 12 +- repository.c | 27 +- repository.h | 11 +- sha1-array.c | 17 ++ sha1-array.h | 3 + submodule.c | 275 +++++++++++++++---- t/helper/test-submodule-nested-repo-config.c | 8 +- t/t5526-fetch-submodules.sh | 23 +- 11 files changed, 315 insertions(+), 97 deletions(-) git range-diff origin/xxx/sb-submodule-recursive-fetch-gets-the-tip-in-pu... [...] 585: ac1f98a0df < -: ---------- doc: move git-rev-parse from porcelain to plumbing 586: 7cf1a0fbef = 1: a035323c49 sha1-array: provide oid_array_filter 587: 01077381d0 = 2: 30ed20b4f0 submodule.c: fix indentation 588: 4b0cdf5899 = 3: cd590ea88d submodule.c: sort changed_submodule_names before searching it 589: 78e5099ecc ! 4: ce959811ba submodule.c: move global changed_submodule_names into fetch submodule struct @@ -12,7 +12,7 @@ --- a/submodule.c +++ b/submodule.c @@ - #include "commit-reach.h" + #include "object-store.h" static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF; -static struct string_list changed_submodule_names = STRING_LIST_INIT_DUP; 590: d813f18bb3 = 5: 151f9a8ad4 submodule.c: do not copy around submodule list 591: a077d63af7 ! 6: 3a97743fa2 repository: repo_submodule_init to take a submodule struct @@ -15,7 +15,6 @@ Also move its documentation into the header file. Signed-off-by: Stefan Beller <sbeller@google.com> - Signed-off-by: Junio C Hamano <gitster@pobox.com> diff --git a/builtin/grep.c b/builtin/grep.c --- a/builtin/grep.c @@ -31,12 +30,16 @@ + int hit; - if (!is_submodule_active(superproject, path)) + /* +@@ return 0; + } -- if (repo_submodule_init(&submodule, superproject, path)) -+ if (repo_submodule_init(&subrepo, superproject, sub)) +- if (repo_submodule_init(&submodule, superproject, path)) { ++ if (repo_submodule_init(&subrepo, superproject, sub)) { + grep_read_unlock(); return 0; + } - repo_read_gitmodules(&submodule); + repo_read_gitmodules(&subrepo); @@ -44,9 +47,9 @@ /* * NEEDSWORK: This adds the submodule's object directory to the list of @@ + * store is no longer global and instead is a member of the repository * object. */ - grep_read_lock(); - add_to_alternates_memory(submodule.objects->objectdir); + add_to_alternates_memory(subrepo.objects->objectdir); grep_read_unlock(); @@ -100,19 +103,6 @@ static void show_ce(struct repository *repo, struct dir_struct *dir, -diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c ---- a/builtin/submodule--helper.c -+++ b/builtin/submodule--helper.c -@@ - 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)) { - diff --git a/repository.c b/repository.c --- a/repository.c +++ b/repository.c @@ -197,3 +187,32 @@ void repo_clear(struct repository *repo); /* + +diff --git a/t/helper/test-submodule-nested-repo-config.c b/t/helper/test-submodule-nested-repo-config.c +--- a/t/helper/test-submodule-nested-repo-config.c ++++ b/t/helper/test-submodule-nested-repo-config.c +@@ + + int cmd__submodule_nested_repo_config(int argc, const char **argv) + { +- struct repository submodule; ++ struct repository subrepo; ++ const struct submodule *sub; + + if (argc < 3) + die_usage(argc, argv, "Wrong number of arguments."); + + setup_git_directory(); + +- if (repo_submodule_init(&submodule, the_repository, argv[1])) { ++ sub = submodule_from_path(the_repository, &null_oid, argv[1]); ++ if (repo_submodule_init(&subrepo, the_repository, sub)) { + die_usage(argc, argv, "Submodule not found."); + } + + /* Read the config of _child_ submodules. */ +- print_config_from_gitmodules(&submodule, argv[2]); ++ print_config_from_gitmodules(&subrepo, argv[2]); + + submodule_free(the_repository); + 592: 780f6c1a92 = 7: 4e8ad61f8d submodule: fetch in submodules git directory instead of in worktree 593: a530535912 = 8: 24bac00db7 fetch: retry fetching submodules if needed objects were not fetched 594: a72bde3a8a = 9: e031182e44 builtin/fetch: check for submodule updates for non branch fetches [...]