aboutsummaryrefslogtreecommitdiffstats
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-04-01 13:21:35 -0700
committerJunio C Hamano <gitster@pobox.com>2024-04-01 13:21:35 -0700
commitf949703f4b0a89704f45ccd8552334d1627949b9 (patch)
tree798ce2eb5daa9a28097fc60b1f6c6dcab90307d0 /builtin
parentf0c570e20b1adcb0ab2ed5d61d3c762ea4bf86e3 (diff)
parent647e870a08e31984f5f42703f3618ff378a72932 (diff)
downloadgit-f949703f4b0a89704f45ccd8552334d1627949b9.tar.gz
Merge branch 'jk/rebase-apply-leakfix'
Leakfix. * jk/rebase-apply-leakfix: rebase: use child_process_clear() to clean
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rebase.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index e444ab102d..b9d0fb3269 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -610,7 +610,7 @@ static int run_am(struct rebase_options *opts)
status = error_errno(_("could not open '%s' for writing"),
rebased_patches);
free(rebased_patches);
- strvec_clear(&am.args);
+ child_process_clear(&am);
return status;
}
@@ -638,7 +638,7 @@ static int run_am(struct rebase_options *opts)
struct reset_head_opts ropts = { 0 };
unlink(rebased_patches);
free(rebased_patches);
- strvec_clear(&am.args);
+ child_process_clear(&am);
ropts.oid = &opts->orig_head->object.oid;
ropts.branch = opts->head_name;
@@ -659,7 +659,7 @@ static int run_am(struct rebase_options *opts)
status = error_errno(_("could not open '%s' for reading"),
rebased_patches);
free(rebased_patches);
- strvec_clear(&am.args);
+ child_process_clear(&am);
return status;
}