summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-11 10:33:27 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-11 10:33:27 -0700
commit825fd93767510895a98ad7f12e3c1af3e40e367b (patch)
treeea3b4beac8dae69e2b45c9bfb8ce2cc21f462499 /builtin/commit.c
parent49feda62bddc188d8b2fa413437b5fc70e3de51f (diff)
parent1f87293d78a4b2bd9265bac49b14a6f1111918b8 (diff)
downloadgit-825fd93767510895a98ad7f12e3c1af3e40e367b.tar.gz
Merge branch 'rs/child-process-init'
Code clean-up. * rs/child-process-init: run-command: inline prepare_run_command_v_opt() run-command: call run_command_v_opt_cd_env() instead of duplicating it run-command: introduce child_process_init() run-command: introduce CHILD_PROCESS_INIT
Diffstat (limited to 'builtin/commit.c')
-rw-r--r--builtin/commit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 36e3a2eef2..ec0048e8b0 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1540,7 +1540,7 @@ static int run_rewrite_hook(const unsigned char *oldsha1,
{
/* oldsha1 SP newsha1 LF NUL */
static char buf[2*40 + 3];
- struct child_process proc;
+ struct child_process proc = CHILD_PROCESS_INIT;
const char *argv[3];
int code;
size_t n;
@@ -1552,7 +1552,6 @@ static int run_rewrite_hook(const unsigned char *oldsha1,
argv[1] = "amend";
argv[2] = NULL;
- memset(&proc, 0, sizeof(proc));
proc.argv = argv;
proc.in = -1;
proc.stdout_to_stderr = 1;