mirror of
https://github.com/git/git.git
synced 2024-05-09 20:46:09 +02:00
Merge branch 'jk/rebase-apply-leakfix' into next
Leakfix. * jk/rebase-apply-leakfix: rebase: use child_process_clear() to clean
This commit is contained in:
commit
f9358272af
|
@ -610,7 +610,7 @@ static int run_am(struct rebase_options *opts)
|
||||||
status = error_errno(_("could not open '%s' for writing"),
|
status = error_errno(_("could not open '%s' for writing"),
|
||||||
rebased_patches);
|
rebased_patches);
|
||||||
free(rebased_patches);
|
free(rebased_patches);
|
||||||
strvec_clear(&am.args);
|
child_process_clear(&am);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -638,7 +638,7 @@ static int run_am(struct rebase_options *opts)
|
||||||
struct reset_head_opts ropts = { 0 };
|
struct reset_head_opts ropts = { 0 };
|
||||||
unlink(rebased_patches);
|
unlink(rebased_patches);
|
||||||
free(rebased_patches);
|
free(rebased_patches);
|
||||||
strvec_clear(&am.args);
|
child_process_clear(&am);
|
||||||
|
|
||||||
ropts.oid = &opts->orig_head->object.oid;
|
ropts.oid = &opts->orig_head->object.oid;
|
||||||
ropts.branch = opts->head_name;
|
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"),
|
status = error_errno(_("could not open '%s' for reading"),
|
||||||
rebased_patches);
|
rebased_patches);
|
||||||
free(rebased_patches);
|
free(rebased_patches);
|
||||||
strvec_clear(&am.args);
|
child_process_clear(&am);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,4 +58,13 @@ test_expect_success 'unknown key in author-script' '
|
||||||
check_resolve_fails
|
check_resolve_fails
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success POSIXPERM,SANITY 'unwritable rebased-patches does not leak' '
|
||||||
|
>.git/rebased-patches &&
|
||||||
|
chmod a-w .git/rebased-patches &&
|
||||||
|
|
||||||
|
git checkout -b side HEAD^ &&
|
||||||
|
test_commit unrelated &&
|
||||||
|
test_must_fail git rebase --apply --onto tmp HEAD^
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in New Issue