From a17062cf42556593fb73547e613b0be867026257 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Tue, 2 May 2017 12:32:12 -0700 Subject: [PATCH] submodule_move_head: reuse child_process structure for futher commands We do not need to declare another struct child_process, but we can just reuse the existing `cp` struct. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/submodule.c b/submodule.c index d3299e29c0..a2377ce019 100644 --- a/submodule.c +++ b/submodule.c @@ -1468,15 +1468,15 @@ int submodule_move_head(const char *path, if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) { if (new) { - struct child_process cp1 = CHILD_PROCESS_INIT; + child_process_init(&cp); /* also set the HEAD accordingly */ - cp1.git_cmd = 1; - cp1.no_stdin = 1; - cp1.dir = path; + cp.git_cmd = 1; + cp.no_stdin = 1; + cp.dir = path; - argv_array_pushl(&cp1.args, "update-ref", "HEAD", new, NULL); + argv_array_pushl(&cp.args, "update-ref", "HEAD", new, NULL); - if (run_command(&cp1)) { + if (run_command(&cp)) { ret = -1; goto out; } -- 2.43.2