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 /builtin/replace.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 'builtin/replace.c')
| -rw-r--r-- | builtin/replace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index 294b61b97e..d2aac64260 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -197,7 +197,7 @@ static int replace_object(const char *object_ref, const char *replace_ref, int f static void export_object(const unsigned char *sha1, enum object_type type, int raw, const char *filename) { - struct child_process cmd = { NULL }; + struct child_process cmd = CHILD_PROCESS_INIT; int fd; fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666); @@ -234,7 +234,7 @@ static void import_object(unsigned char *sha1, enum object_type type, if (!raw && type == OBJ_TREE) { const char *argv[] = { "mktree", NULL }; - struct child_process cmd = { argv }; + struct child_process cmd = CHILD_PROCESS_INIT; struct strbuf result = STRBUF_INIT; cmd.argv = argv; |