diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-01 13:21:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-01 13:21:35 -0700 |
| commit | f949703f4b0a89704f45ccd8552334d1627949b9 (patch) | |
| tree | 798ce2eb5daa9a28097fc60b1f6c6dcab90307d0 /builtin/rebase.c | |
| parent | Merge branch 'ps/t7800-variable-interpolation-fix' (diff) | |
| parent | rebase: use child_process_clear() to clean (diff) | |
| download | git-f949703f4b0a89704f45ccd8552334d1627949b9.tar.gz git-f949703f4b0a89704f45ccd8552334d1627949b9.zip | |
Merge branch 'jk/rebase-apply-leakfix'
Leakfix.
* jk/rebase-apply-leakfix:
rebase: use child_process_clear() to clean
Diffstat (limited to 'builtin/rebase.c')
| -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 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; } |