From: Christian Weisgerber <naddy@mips.inka.de>
Subject: Re: rebase suffers '?' conflicts
To: gameoftrees@openbsd.org
Date: Thu, 13 Apr 2023 00:13:45 +0200

Stefan Sperling:

> Can you try this? If this works then I'll try to add regress coverage
> as well before committing it.

Yes!!  With that my reproducer script completes successfully.

> --- lib/worktree.c
> +++ lib/worktree.c
> @@ -7393,7 +7393,7 @@ got_worktree_rebase_abort(struct got_worktree *worktre
>  	rfa.patch_cb = NULL;
>  	rfa.patch_arg = NULL;
>  	rfa.repo = repo;
> -	rfa.unlink_added_files = 0;
> +	rfa.unlink_added_files = 1;
>  	err = worktree_status(worktree, "", fileindex, repo,
>  	    revert_file, &rfa, NULL, NULL, 1, 0);
>  	if (err)
> @@ -7755,7 +7755,7 @@ got_worktree_histedit_abort(struct got_worktree *workt
>  	rfa.patch_cb = NULL;
>  	rfa.patch_arg = NULL;
>  	rfa.repo = repo;
> -	rfa.unlink_added_files = 0;
> +	rfa.unlink_added_files = 1;
>  	err = worktree_status(worktree, "", fileindex, repo,
>  	    revert_file, &rfa, NULL, NULL, 1, 0);
>  	if (err)

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de