From: Stefan Beller <sbeller@google.com>
Date: Tue, 2 May 2017 19:32:12 +0000 (-0700)
Subject: submodule_move_head: reuse child_process structure for futher commands
X-Git-Tag: v2.13.2~27^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a17062cf42556593fb73547e613b0be867026257;p=git-core%2Fgit.git

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 d3299e29c..a2377ce01 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;
 			}