Skip to content

Commit bac92b1

Browse files
committed
Merge branch 'js/ort-clean-up-after-failed-merge'
Plug memory leaks in the failure code path in the "merge-ort" merge strategy backend. * js/ort-clean-up-after-failed-merge: merge-ort: do leave trace2 region even if checkout fails merge-ort: clean up after failed merge
2 parents b9654be + 1250dff commit bac92b1

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

merge-ort.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4536,6 +4536,8 @@ void merge_switch_to_result(struct merge_options *opt,
45364536
if (checkout(opt, head, result->tree)) {
45374537
/* failure to function */
45384538
result->clean = -1;
4539+
merge_finalize(opt, result);
4540+
trace2_region_leave("merge", "checkout", opt->repo);
45394541
return;
45404542
}
45414543
trace2_region_leave("merge", "checkout", opt->repo);
@@ -4546,6 +4548,9 @@ void merge_switch_to_result(struct merge_options *opt,
45464548
/* failure to function */
45474549
opt->priv = NULL;
45484550
result->clean = -1;
4551+
merge_finalize(opt, result);
4552+
trace2_region_leave("merge", "record_conflicted",
4553+
opt->repo);
45494554
return;
45504555
}
45514556
opt->priv = NULL;

0 commit comments

Comments
 (0)