@@ -2587,7 +2587,7 @@ static int update_submodule(struct update_data *update_data)
if (update_data->recursive) {
struct child_process cp = CHILD_PROCESS_INIT;
struct update_data next = *update_data;
- int res;
+ int ret;
next.prefix = NULL;
oidcpy(&next.oid, null_oid());
@@ -2599,14 +2599,14 @@ static int update_submodule(struct update_data *update_data)
update_data_to_args(&next, &cp.args);
/* die() if child process die()'d */
- res = run_command(&cp);
- if (!res)
+ ret = run_command(&cp);
+ if (!ret)
return 0;
die_message(_("Failed to recurse into submodule path '%s'"),
update_data->displaypath);
- if (res == 128)
- exit(res);
- else if (res)
+ if (ret == 128)
+ exit(ret);
+ else if (ret)
return 1;
}
Rename the "res" variable added in b3c5f5cb048 (submodule: move core cmd_update() logic to C, 2022-03-15) to "ret", which is the convention in the rest of this file. Subsequent commits will change this code to a "goto cleanup" pattern, let's have the post image look consistent with the rest. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/submodule--helper.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)