mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-05 12:56:11 +02:00
Code

submodule--helper: reduce logic in run_update_procedure() 

A later commit will combine the "update-clone" and
"run-update-procedure" commands, so run_update_procedure() will be
removed. Prepare for this by moving as much logic as possible out of
run_update_procedure() and into update_submodule2().

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-15 14:09:23 -07:00 committed by Junio C Hamano
parent c9911c9358
commit 75df9df0f8
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
builtin/submodule--helper.c
View File

@ -2611,7 +2611,6 @@ static int update_clone(int argc, const char **argv, const char *prefix)
static int run_update_procedure(int argc, const char **argv, const char *prefix)
{
char *prefixed_path;
struct update_data update_data = UPDATE_DATA_INIT;
struct option options[] = {
@ -2653,18 +2652,6 @@ static int run_update_procedure(int argc, const char **argv, const char *prefix)
update_data.sm_path = argv[0];
if (update_data.recursive_prefix)
prefixed_path = xstrfmt("%s%s", update_data.recursive_prefix, update_data.sm_path);
else
prefixed_path = xstrdup(update_data.sm_path);
update_data.displaypath = get_submodule_displaypath(prefixed_path, prefix);
determine_submodule_update_strategy(the_repository, update_data.just_cloned,
update_data.sm_path, update_data.update_default,
&update_data.update_strategy);
free(prefixed_path);
return update_submodule2(&update_data);
}
@ -3044,7 +3031,24 @@ static int module_create_branch(int argc, const char **argv, const char *prefix)
/* NEEDSWORK: this is a temporary name until we delete update_submodule() */
static int update_submodule2(struct update_data *update_data)
{
char *prefixed_path;
ensure_core_worktree(update_data->sm_path);
if (update_data->recursive_prefix)
prefixed_path = xstrfmt("%s%s", update_data->recursive_prefix,
update_data->sm_path);
else
prefixed_path = xstrdup(update_data->sm_path);
update_data->displaypath = get_submodule_displaypath(prefixed_path,
update_data->prefix);
free(prefixed_path);
determine_submodule_update_strategy(the_repository, update_data->just_cloned,
update_data->sm_path, update_data->update_default,
&update_data->update_strategy);
if (update_data->just_cloned)
oidcpy(&update_data->suboid, null_oid());
else if (resolve_gitlink_ref(update_data->sm_path, "HEAD", &update_data->suboid))