diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:27 -0700 |
| commit | 825fd93767510895a98ad7f12e3c1af3e40e367b (patch) | |
| tree | ea3b4beac8dae69e2b45c9bfb8ce2cc21f462499 /upload-pack.c | |
| parent | 49feda62bddc188d8b2fa413437b5fc70e3de51f (diff) | |
| parent | 1f87293d78a4b2bd9265bac49b14a6f1111918b8 (diff) | |
| download | git-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 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/upload-pack.c b/upload-pack.c index 01de944a0a..c9ea1d3be6 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -80,7 +80,7 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data) static void create_pack_file(void) { - struct child_process pack_objects; + struct child_process pack_objects = CHILD_PROCESS_INIT; char data[8193], progress[128]; char abort_msg[] = "aborting due to possible repository " "corruption on the remote side."; @@ -108,7 +108,6 @@ static void create_pack_file(void) argv[arg++] = "--include-tag"; argv[arg++] = NULL; - memset(&pack_objects, 0, sizeof(pack_objects)); pack_objects.in = -1; pack_objects.out = -1; pack_objects.err = -1; @@ -448,7 +447,7 @@ static void check_non_tip(void) static const char *argv[] = { "rev-list", "--stdin", NULL, }; - static struct child_process cmd; + static struct child_process cmd = CHILD_PROCESS_INIT; struct object *o; char namebuf[42]; /* ^ + SHA-1 + LF */ int i; |