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 <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/submodule.c b/submodule.c
index d3299e29c0855b8503f444f659e2b24bba8ecb1f..a2377ce019a39dcd0fc9aa05f1282f44f48ddbea 100644 (file)
--- 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) {
 
        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 */
                        /* 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;
                        }
                                ret = -1;
                                goto out;
                        }