summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-07-17 23:27:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-18 19:14:47 (GMT)
commit92859f3a7906cf1a1d398307ba21a062984550d6 (patch)
treef5ad7a78027fda1b70bf17f179ce1ba16d13f39d
parent14576df044be25b00d43aa24057d3abe4b9fd6f5 (diff)
downloadgit-92859f3a7906cf1a1d398307ba21a062984550d6.zip
git-92859f3a7906cf1a1d398307ba21a062984550d6.tar.gz
git-92859f3a7906cf1a1d398307ba21a062984550d6.tar.bz2
bundle: use internal argv_array of struct child_process in create_bundle()
Use the existing argv_array member instead of providing our own. This way the argv_array is cleared after use automatically for us; it was leaking before. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--bundle.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/bundle.c b/bundle.c
index 1222952..71a21a6 100644
--- a/bundle.c
+++ b/bundle.c
@@ -237,8 +237,6 @@ int create_bundle(struct bundle_header *header, const char *path,
static struct lock_file lock;
int bundle_fd = -1;
int bundle_to_stdout;
- struct argv_array argv_boundary = ARGV_ARRAY_INIT;
- struct argv_array argv_pack = ARGV_ARRAY_INIT;
int i, ref_count = 0;
struct strbuf buf = STRBUF_INIT;
struct rev_info revs;
@@ -260,14 +258,12 @@ int create_bundle(struct bundle_header *header, const char *path,
init_revisions(&revs, NULL);
/* write prerequisites */
- argv_array_pushl(&argv_boundary,
+ memset(&rls, 0, sizeof(rls));
+ argv_array_pushl(&rls.args,
"rev-list", "--boundary", "--pretty=oneline",
NULL);
for (i = 1; i < argc; i++)
- argv_array_push(&argv_boundary, argv[i]);
-
- memset(&rls, 0, sizeof(rls));
- rls.argv = argv_boundary.argv;
+ argv_array_push(&rls.args, argv[i]);
rls.out = -1;
rls.git_cmd = 1;
if (start_command(&rls))
@@ -382,12 +378,11 @@ int create_bundle(struct bundle_header *header, const char *path,
write_or_die(bundle_fd, "\n", 1);
/* write pack */
- argv_array_pushl(&argv_pack,
+ memset(&rls, 0, sizeof(rls));
+ argv_array_pushl(&rls.args,
"pack-objects", "--all-progress-implied",
"--stdout", "--thin", "--delta-base-offset",
NULL);
- memset(&rls, 0, sizeof(rls));
- rls.argv = argv_pack.argv;
rls.in = -1;
rls.out = bundle_fd;
rls.git_cmd = 1;