summaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-11 17:33:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-11 17:33:27 (GMT)
commit825fd93767510895a98ad7f12e3c1af3e40e367b (patch)
treeea3b4beac8dae69e2b45c9bfb8ce2cc21f462499 /bundle.c
parent49feda62bddc188d8b2fa413437b5fc70e3de51f (diff)
parent1f87293d78a4b2bd9265bac49b14a6f1111918b8 (diff)
downloadgit-825fd93767510895a98ad7f12e3c1af3e40e367b.zip
git-825fd93767510895a98ad7f12e3c1af3e40e367b.tar.gz
git-825fd93767510895a98ad7f12e3c1af3e40e367b.tar.bz2
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 'bundle.c')
-rw-r--r--bundle.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/bundle.c b/bundle.c
index b708906..b2b89fe 100644
--- a/bundle.c
+++ b/bundle.c
@@ -240,7 +240,7 @@ int create_bundle(struct bundle_header *header, const char *path,
int i, ref_count = 0;
struct strbuf buf = STRBUF_INIT;
struct rev_info revs;
- struct child_process rls;
+ struct child_process rls = CHILD_PROCESS_INIT;
FILE *rls_fout;
bundle_to_stdout = !strcmp(path, "-");
@@ -258,7 +258,6 @@ int create_bundle(struct bundle_header *header, const char *path,
init_revisions(&revs, NULL);
/* write prerequisites */
- memset(&rls, 0, sizeof(rls));
argv_array_pushl(&rls.args,
"rev-list", "--boundary", "--pretty=oneline",
NULL);
@@ -417,14 +416,13 @@ int unbundle(struct bundle_header *header, int bundle_fd, int flags)
{
const char *argv_index_pack[] = {"index-pack",
"--fix-thin", "--stdin", NULL, NULL};
- struct child_process ip;
+ struct child_process ip = CHILD_PROCESS_INIT;
if (flags & BUNDLE_VERBOSE)
argv_index_pack[3] = "-v";
if (verify_bundle(header, 0))
return -1;
- memset(&ip, 0, sizeof(ip));
ip.argv = argv_index_pack;
ip.in = bundle_fd;
ip.no_stdout = 1;