* Introduce new patch
"submodule--helper: replace connect-gitdir-workingtree by
ensure-core-worktree"
that resolves the conflict with earlier versions of this series with
sb/submodule-core-worktree
* This series is based on master, which already contains
sb/submodule-core-worktree
Thanks,
Stefan
Stefan Beller (7):
git-submodule.sh: align error reporting for update mode to use path
git-submodule.sh: rename unused variables
builtin/submodule--helper: factor out submodule updating
builtin/submodule--helper: store update_clone information in a struct
builtin/submodule--helper: factor out method to update a single
submodule
submodule--helper: replace connect-gitdir-workingtree by
ensure-core-worktree
submodule--helper: introduce new update-module-mode helper
builtin/submodule--helper.c | 216 ++++++++++++++++++++++++++----------
git-submodule.sh | 29 +----
2 files changed, 164 insertions(+), 81 deletions(-)
./git-range-diff origin/sb/submodule-update-in-c...HEAD
[...]
-: ----------- > 338: 1d89318c48d Fifth batch for 2.19 cycle
1: c1cb423b249 = 339: 3090cbcb46e git-submodule.sh: align error reporting
for update mode to use path
2: f188b30a9b9 = 340: 850a16e9085 git-submodule.sh: rename unused variables
3: 70d84fa6a09 ! 341: 88af0cdcba6 builtin/submodule--helper: factor out
submodule updating
@@ -73,10 +73,10 @@
};
suc.prefix = prefix;
-- config_from_gitmodules(gitmodules_update_clone_config, &max_jobs);
-- git_config(gitmodules_update_clone_config, &max_jobs);
-+ config_from_gitmodules(gitmodules_update_clone_config, &suc.max_jobs);
-+ git_config(gitmodules_update_clone_config, &suc.max_jobs);
+- update_clone_config_from_gitmodules(&max_jobs);
+- git_config(git_update_clone_config, &max_jobs);
++ update_clone_config_from_gitmodules(&suc.max_jobs);
++ git_config(git_update_clone_config, &suc.max_jobs);
argc = parse_options(argc, argv, prefix, module_update_clone_options,
git_submodule_helper_usage, 0);
4: 511e8a139c9 = 342: 2fdd479a6d5 builtin/submodule--helper: store
update_clone information in a struct
5: 65b2a720b90 = 343: 34589e724b3 builtin/submodule--helper: factor out
method to update a single submodule
-: ----------- > 344: ee2bb4f23d8 submodule--helper: replace
connect-gitdir-workingtree by ensure-core-worktree
6: e5803d07f9b ! 345: 03300626ba7 submodule--helper: introduce new
update-module-mode helper
@@ -88,15 +88,15 @@
{"clone", module_clone, 0},
+ {"update-module-mode", module_update_module_mode, 0},
{"update-clone", update_clone, 0},
+ {"ensure-core-worktree", ensure_core_worktree, 0},
{"relative-path", resolve_relative_path, 0},
- {"resolve-relative-url", resolve_relative_url, 0},
diff --git a/git-submodule.sh b/git-submodule.sh
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@
- do
- die_if_unmatched "$quickabort" "$sha1"
+
+ git submodule--helper ensure-core-worktree "$sm_path"
- name=$(git submodule--helper name "$sm_path") || exit
- if ! test -z "$update"
