Re: [PATCH 0/7] Fix and improve some error codepaths in merge-ort

Taylor Blau
2024-06-13T23:04:20Z

On Thu, Jun 13, 2024 at 08:25:00PM +0000, Elijah Newren via GitGitGadget wrote:
> Elijah Newren (7):
> merge-ort: extract handling of priv member into reusable function
> merge-ort: maintain expected invariant for priv member
> merge-ort: fix type of local 'clean' var in handle_content_merge()
> merge-ort: clearer propagation of failure-to-function from
> merge_submodule
> merge-ort: loosen commented requirements
> merge-ort: upon merge abort, only show messages causing the abort
> merge-ort: convert more error() cases to path_msg()
>
> merge-ort.c | 167 +++++++++++++++++++++++++++++++-----------
> t/t6406-merge-attr.sh | 42 ++++++++++-
> 2 files changed, 164 insertions(+), 45 deletions(-)

Very nice. I had a couple of minor thoughts on the earlier patches, but
I agree with the substantive ones that printing only messages related to
paths that we were processing when something went horribly wrong is a
good idea.

I don't think that either of my comments alone merit a reroll, and I'd
be happy to see this version move along as-is. But I'm equally happy if
you want to fix a typo here or there or do some bikeshedding ;-).

Thanks for fixing this issue.

Thanks,
Taylor