summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-03-25 16:38:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-25 16:38:25 -0700
commitdd9ff30dffdd03c579f4d867286dac3e46e05c8d (patch)
treeeeea4590b6fb9d9d470642a1608021eb70bc63d4 /builtin
parentMerge branch 'ps/fsync-refs' (diff)
parentsubmodule: fix latent check_has_commit() bug (diff)
downloadtgif-dd9ff30dffdd03c579f4d867286dac3e46e05c8d.tar.xz
Merge branch 'gc/recursive-fetch-with-unused-submodules'
When "git fetch --recurse-submodules" grabbed submodule commits that would be needed to recursively check out newly fetched commits in the superproject, it only paid attention to submodules that are in the current checkout of the superproject. We now do so for all submodules that have been run "git submodule init" on. * gc/recursive-fetch-with-unused-submodules: submodule: fix latent check_has_commit() bug fetch: fetch unpopulated, changed submodules submodule: move logic into fetch_task_create() submodule: extract get_fetch_task() submodule: store new submodule commits oid_array in a struct submodule: inline submodule_commits() into caller submodule: make static functions read submodules from commits t5526: create superproject commits with test helper t5526: stop asserting on stderr literally t5526: introduce test helper to assert on fetches
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fetch.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 4d12c2fd4d..9b4018f62c 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -2258,13 +2258,13 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
max_children = fetch_parallel_config;
add_options_to_argv(&options);
- result = fetch_populated_submodules(the_repository,
- &options,
- submodule_prefix,
- recurse_submodules,
- recurse_submodules_default,
- verbosity < 0,
- max_children);
+ result = fetch_submodules(the_repository,
+ &options,
+ submodule_prefix,
+ recurse_submodules,
+ recurse_submodules_default,
+ verbosity < 0,
+ max_children);
strvec_clear(&options);
}