mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-08 09:46:08 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2022-08-08 13:13:14 -07:00
parent b9654bee99 1250dff32b
commit bac92b1f39
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
merge-ort.c
View File

@ -4536,6 +4536,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);
@ -4546,6 +4548,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;