diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-25 23:26:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-25 23:26:51 (GMT) |
| commit | f9358272af0bf1bff5585787ce6034a011fb8df1 (patch) | |
| tree | 3964c5945fa8dc8b620dbfeade2a23e4ceea526a /builtin | |
| parent | e7b1ec4df4b308ab761db5c7a055fabbc00c5f80 (diff) | |
| parent | 647e870a08e31984f5f42703f3618ff378a72932 (diff) | |
| download | git-f9358272af0bf1bff5585787ce6034a011fb8df1.zip git-f9358272af0bf1bff5585787ce6034a011fb8df1.tar.gz git-f9358272af0bf1bff5585787ce6034a011fb8df1.tar.bz2 | |
Merge branch 'jk/rebase-apply-leakfix' into next
Leakfix.
* jk/rebase-apply-leakfix:
rebase: use child_process_clear() to clean
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index e444ab1..b9d0fb3 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; } |