Re: [PATCH v2 0/2] merge-ort: clean up after failed merge

From: Elijah Newren <newren@gmail.com>
Date: Jul 30, 2022, 00:50 UTC
Message-ID: <CABPp-BGKUkVKJK87jZn-7A3AuxDjKwttVpez9UVZrTJZyCFodw@mail.gmail.com>
In-Reply-To: <pull.1307.v2.git.1659114727.gitgitgadget@gmail.com>

On Fri, Jul 29, 2022 at 10:12 AM Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 15 quoted lines

>
> I was investigating why seen's CI runs fail, and came up with this fix.
>
> Changes since v1:
>
>  * Rebased onto en/merge-ort-perf.
>  * Now we're not only cleaning up the merge data structure, but also leaving
>    the Trace2 region when returning early from merge_switch_to_result().
>
> Johannes Schindelin (2):
>   merge-ort: clean up after failed merge
>   merge-ort: do leave Trace2 region even if checkout fails
>
>  merge-ort.c | 5 +++++
>  1 file changed, 5 insertions(+)

Thanks, series looks good to me:

Reviewed-by: Elijah Newren <newren@gmail.com>