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

submodule--helper: run update using child process struct

Browse Source 
We switch to using the run-command API function that takes a
'struct child process', since we are using a lot of the options. This
will also make it simple to switch over to using 'capture_command()'
when we start handling the output of the command completely in C.

Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Shourya Shukla <periperidip@gmail.com>
Signed-off-by: Atharva Raykar <raykar.ath@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Atharva Raykar 2022-03-15 14:09:19 -07:00 committed by Junio C Hamano
parent d23e51a23e
commit 3c3558f095
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
builtin/submodule--helper.c
View File

@ -2325,47 +2325,45 @@ static int fetch_in_submodule(const char *module_path, int depth, int quiet, str
static int run_update_command(struct update_data *ud, int subforce) static int run_update_command(struct update_data *ud, int subforce)
{ {
struct strvec args = STRVEC_INIT; struct child_process cp = CHILD_PROCESS_INIT;
struct strvec child_env = STRVEC_INIT;
char *oid = oid_to_hex(&ud->oid); char *oid = oid_to_hex(&ud->oid);
int must_die_on_failure = 0; int must_die_on_failure = 0;
int git_cmd;
switch (ud->update_strategy.type) { switch (ud->update_strategy.type) {
case SM_UPDATE_CHECKOUT: case SM_UPDATE_CHECKOUT:
git_cmd = 1; cp.git_cmd = 1;
strvec_pushl(&args, "checkout", "-q", NULL); strvec_pushl(&cp.args, "checkout", "-q", NULL);
if (subforce) if (subforce)
strvec_push(&args, "-f"); strvec_push(&cp.args, "-f");
break; break;
case SM_UPDATE_REBASE: case SM_UPDATE_REBASE:
git_cmd = 1; cp.git_cmd = 1;
strvec_push(&args, "rebase"); strvec_push(&cp.args, "rebase");
if (ud->quiet) if (ud->quiet)
strvec_push(&args, "--quiet"); strvec_push(&cp.args, "--quiet");
must_die_on_failure = 1; must_die_on_failure = 1;
break; break;
case SM_UPDATE_MERGE: case SM_UPDATE_MERGE:
git_cmd = 1; cp.git_cmd = 1;
strvec_push(&args, "merge"); strvec_push(&cp.args, "merge");
if (ud->quiet) if (ud->quiet)
strvec_push(&args, "--quiet"); strvec_push(&cp.args, "--quiet");
must_die_on_failure = 1; must_die_on_failure = 1;
break; break;
case SM_UPDATE_COMMAND: case SM_UPDATE_COMMAND:
git_cmd = 0; cp.use_shell = 1;
strvec_push(&args, ud->update_strategy.command); strvec_push(&cp.args, ud->update_strategy.command);
must_die_on_failure = 1; must_die_on_failure = 1;
break; break;
default: default:
BUG("unexpected update strategy type: %s", BUG("unexpected update strategy type: %s",
submodule_strategy_to_string(&ud->update_strategy)); submodule_strategy_to_string(&ud->update_strategy));
} }
strvec_push(&args, oid); strvec_push(&cp.args, oid);
prepare_submodule_repo_env(&child_env); cp.dir = xstrdup(ud->sm_path);
if (run_command_v_opt_cd_env(args.v, git_cmd ? RUN_GIT_CMD : RUN_USING_SHELL, prepare_submodule_repo_env(&cp.env_array);
ud->sm_path, child_env.v)) { if (run_command(&cp)) {
switch (ud->update_strategy.type) { switch (ud->update_strategy.type) {
case SM_UPDATE_CHECKOUT: case SM_UPDATE_CHECKOUT:
printf(_("Unable to checkout '%s' in submodule path '%s'"), printf(_("Unable to checkout '%s' in submodule path '%s'"),