From: Stefan Sperling <stsp@stsp.name>
Subject: Re: rebase suffers '?' conflicts
To: Christian Weisgerber <naddy@mips.inka.de>
Cc: gameoftrees@openbsd.org
Date: Fri, 14 Apr 2023 14:18:20 +0200

On Thu, Apr 13, 2023 at 10:40:06PM +0200, Christian Weisgerber wrote:
> Stefan Sperling:
> 
> > Here is a more complete diff which implements the fix for rebase,
> > histedit, and merge. With an added safeguard for files which appear
> > in added status during the revert step but were not merged into the
> > work tree as part of the most recently rebased/edited/merged commit.
> 
> This works for my long-suffering test case.
> The added safeguard case also works.
> 
> > Also adds test coverage.
> > 
> > OK?
> 
> OK as far as I'm concerned, although I don't fully understand the
> code.  I found a cosmetic pasto, though:
> 
> > +get_paths_added_between_commits(struct got_pathlist_head *added_paths,
> ...
> > +		} else {
> > +			if (asprintf(&abspath, "/%s", pe->path) == -1) {
> > +				err = got_error_from_errno("strdup");
> 				                           asprintf
> > +				goto done;
> > +			}

Thanks, fixed in the committed version. I also noticed that memory
for abspath was leaked in this loop and I have fixed that as well.