undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule--helper: remove ensure-core-worktree

Browse Source 
Move the logic of "git submodule--helper ensure-core-worktree" into
run-update-procedure, and since this makes the ensure-core-worktree
command obsolete, remove it.

As a result, the order of two operations in git-submodule.sh is
reversed: 'set the value of core.worktree' now happens after the call to
"git submodule--helper relative-path". This is safe - "relative-path"
does not depend on the value of core.worktree.

Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Glen Choo 2022-03-04 16:13:59 -08:00 committed by Junio C Hamano
parent 29a5e9e1ff
commit 97cb977c82
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/submodule--helper.c
View File

@ -2783,17 +2783,11 @@ static int push_check(int argc, const char **argv, const char *prefix)
return 0; return 0;
} }
static int ensure_core_worktree(int argc, const char **argv, const char *prefix) static void ensure_core_worktree(const char *path)
{ {
const char *path;
const char *cw; const char *cw;
struct repository subrepo; struct repository subrepo;
if (argc != 2)
BUG("submodule--helper ensure-core-worktree <path>");
path = argv[1];
if (repo_submodule_init(&subrepo, the_repository, path, null_oid())) if (repo_submodule_init(&subrepo, the_repository, path, null_oid()))
die(_("could not get a repository handle for submodule '%s'"), path); die(_("could not get a repository handle for submodule '%s'"), path);
@ -2813,8 +2807,6 @@ static int ensure_core_worktree(int argc, const char **argv, const char *prefix)
free(abs_path); free(abs_path);
strbuf_release(&sb); strbuf_release(&sb);
} }
return 0;
} }
static int absorb_git_dirs(int argc, const char **argv, const char *prefix) static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
@ -3041,6 +3033,7 @@ static int module_create_branch(int argc, const char **argv, const char *prefix)
/* NEEDSWORK: this is a temporary name until we delete update_submodule() */ /* NEEDSWORK: this is a temporary name until we delete update_submodule() */
static int update_submodule2(struct update_data *update_data) static int update_submodule2(struct update_data *update_data)
{ {
ensure_core_worktree(update_data->sm_path);
if (update_data->just_cloned) if (update_data->just_cloned)
oidcpy(&update_data->suboid, null_oid()); oidcpy(&update_data->suboid, null_oid());
else if (resolve_gitlink_ref(update_data->sm_path, "HEAD", &update_data->suboid)) else if (resolve_gitlink_ref(update_data->sm_path, "HEAD", &update_data->suboid))
@ -3459,7 +3452,6 @@ static struct cmd_struct commands[] = {
{"add", module_add, SUPPORT_SUPER_PREFIX}, {"add", module_add, SUPPORT_SUPER_PREFIX},
{"update-clone", update_clone, 0}, {"update-clone", update_clone, 0},
{"run-update-procedure", run_update_procedure, 0}, {"run-update-procedure", run_update_procedure, 0},
{"ensure-core-worktree", ensure_core_worktree, 0},
{"relative-path", resolve_relative_path, 0}, {"relative-path", resolve_relative_path, 0},
{"resolve-relative-url-test", resolve_relative_url_test, 0}, {"resolve-relative-url-test", resolve_relative_url_test, 0},
{"foreach", module_foreach, SUPPORT_SUPER_PREFIX}, {"foreach", module_foreach, SUPPORT_SUPER_PREFIX},

2
git-submodule.sh
View File

@ -385,8 +385,6 @@ cmd_update()
do do
die_if_unmatched "$quickabort" "$sha1" die_if_unmatched "$quickabort" "$sha1"
git submodule--helper ensure-core-worktree "$sm_path" || exit 1
displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix") displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
if test $just_cloned -eq 0 if test $just_cloned -eq 0