[PATCH 10/13] submodule--helper: remove shell interface to ensure_core_worktree()
- From
Atharva Raykar <raykar.ath@gmail.com>
- Date
- Sep 7, 2021, 11:59 UTC
- Message-ID
- <20210907115932.36068-11-raykar.ath@gmail.com>
- In-Reply-To
- <20210907115932.36068-1-raykar.ath@gmail.com>
The 'ensure-core-worktree' subcommand is no longer needed since the conversion of the update code from shell to C.
Let's remove the subcommand, and while we are at it, let's rename 'do_ensure_core_worktree()' to 'ensure_core_worktree()' to signal that it is no longer a utility function meant to be called by another function.
Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: Shourya Shukla <periperidip@gmail.com> Signed-off-by: Atharva Raykar <raykar.ath@gmail.com> --- builtin/submodule--helper.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index e3e85600c3..597e303889 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2740,7 +2740,7 @@ static int push_check(int argc, const char **argv, const char *prefix) return 0; } -static void do_ensure_core_worktree(const char *path) +static void ensure_core_worktree(const char *path) { const struct submodule *sub; const char *cw; @@ -2771,19 +2771,6 @@ static void do_ensure_core_worktree(const char *path) } } -static int ensure_core_worktree(int argc, const char **argv, const char *prefix) -{ - const char *path; - - if (argc != 2) - BUG("submodule--helper ensure-core-worktree <path>"); - - path = argv[1]; - do_ensure_core_worktree(path); - - return 0; -} - static int absorb_git_dirs(int argc, const char **argv, const char *prefix) { int i; @@ -3017,7 +3004,7 @@ static int update_submodule(struct update_data *update_data) char *prefixed_path; struct string_list err = STRING_LIST_INIT_DUP; - do_ensure_core_worktree(update_data->sm_path); + ensure_core_worktree(update_data->sm_path); if (update_data->recursive_prefix) prefixed_path = xstrfmt("%s%s", update_data->recursive_prefix, @@ -3441,7 +3428,6 @@ static struct cmd_struct commands[] = { {"add-clone", add_clone, 0}, {"update", module_update, 0}, {"run-update-procedure", run_update_procedure, 0}, - {"ensure-core-worktree", ensure_core_worktree, 0}, {"relative-path", resolve_relative_path, 0}, {"resolve-relative-url", resolve_relative_url, 0}, {"resolve-relative-url-test", resolve_relative_url_test, 0},
-- 2.32.0