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

submodule--helper run-update-procedure: remove --suboid 

Teach run-update-procedure to determine the oid of the submodule's HEAD
instead of doing it in git-submodule.sh.

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:52 -08:00 committed by Junio C Hamano
parent 1a0b78c953
commit e441966596
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/submodule--helper.c
View File

@ -2594,9 +2594,6 @@ static int run_update_procedure(int argc, const char **argv, const char *prefix)
OPT_CALLBACK_F(0, "oid", &update_data.oid, N_("sha1"), OPT_CALLBACK_F(0, "oid", &update_data.oid, N_("sha1"),
N_("SHA1 expected by superproject"), PARSE_OPT_NONEG, N_("SHA1 expected by superproject"), PARSE_OPT_NONEG,
parse_opt_object_id), parse_opt_object_id),
OPT_CALLBACK_F(0, "suboid", &update_data.suboid, N_("subsha1"),
N_("SHA1 of submodule's HEAD"), PARSE_OPT_NONEG,
parse_opt_object_id),
OPT_END() OPT_END()
}; };
@ -3032,6 +3029,12 @@ 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)
{ {
if (update_data->just_cloned)
oidcpy(&update_data->suboid, null_oid());
else if (resolve_gitlink_ref(update_data->sm_path, "HEAD", &update_data->suboid))
die(_("Unable to find current revision in submodule path '%s'"),
update_data->displaypath);
if (!oideq(&update_data->oid, &update_data->suboid) || update_data->force) if (!oideq(&update_data->oid, &update_data->suboid) || update_data->force)
return do_run_update_procedure(update_data); return do_run_update_procedure(update_data);

8
git-submodule.sh
View File

@ -406,14 +406,9 @@ cmd_update()
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 1 if test $just_cloned -eq 0
then then
subsha1=
else
just_cloned= just_cloned=
subsha1=$(sanitize_submodule_env; cd "$sm_path" &&
git rev-parse --verify HEAD) ||
die "fatal: $(eval_gettext "Unable to find current revision in submodule path '\$displaypath'")"
fi fi
if test -n "$remote" if test -n "$remote"
@ -441,7 +436,6 @@ cmd_update()
${update:+--update "$update"} \ ${update:+--update "$update"} \
${prefix:+--recursive-prefix "$prefix"} \ ${prefix:+--recursive-prefix "$prefix"} \
${sha1:+--oid "$sha1"} \ ${sha1:+--oid "$sha1"} \
${subsha1:+--suboid "$subsha1"} \
"--" \ "--" \
"$sm_path") "$sm_path")