diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-26 21:13:11 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-26 21:13:11 +0300 |
| commit | c2d62d0c7d80b6af90a7ff63aa5909c56ea3b579 (patch) | |
| tree | 99027fb1fc3bc3c2764e65409b5d99028a86c10c | |
| parent | 4b2d41b0ad24301827be2bd494fe6cf63f76ad02 (diff) | |
| parent | 1250dff32bff164e10ffdad19c0dcb5ec0db32d1 (diff) | |
Merge branch 'js/ort-clean-up-after-failed-merge' into maint
Plug memory leaks in the failure code path in the "merge-ort" merge
strategy backend.
source: <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>
* js/ort-clean-up-after-failed-merge:
merge-ort: do leave trace2 region even if checkout fails
merge-ort: clean up after failed merge
| -rw-r--r-- | merge-ort.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index 8c4927f0e1..ebb9a75425 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -4294,6 +4294,8 @@ void merge_switch_to_result(struct merge_options *opt, if (checkout(opt, head, result->tree)) { /* failure to function */ result->clean = -1; + merge_finalize(opt, result); + trace2_region_leave("merge", "checkout", opt->repo); return; } trace2_region_leave("merge", "checkout", opt->repo); @@ -4304,6 +4306,9 @@ void merge_switch_to_result(struct merge_options *opt, /* failure to function */ opt->priv = NULL; result->clean = -1; + merge_finalize(opt, result); + trace2_region_leave("merge", "record_conflicted", + opt->repo); return; } opt->priv = NULL; |