"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
"Omar Polo" <op@omarpolo.com>
Subject:
Re: fix histedit not merging added files correctly
To:
Stefan Sperling <stsp@stsp.name>
Cc:
gameoftrees@openbsd.org
Date:
Mon, 22 Sep 2025 20:53:03 +0200

Download raw body.

Thread
Stefan Sperling <stsp@stsp.name> wrote:
> fix an issue where histedit would not merge added files correctly
> 
> When a file is added during a merge and also already exists on disk as
> an unversioned file, we mistakenly did not put the file onto the list
> of changed files which histedit includes in the next commit. This could
> result in commits which only add new files being dropped as no-op commits.
> 
> If future commits depend on the file being present this would result in
> errors during the histedit operation. Otherwise, the file would no longer
> exist in the edited history.
> 
> ok?

i think we have a few functions with too many arguments, but beside that
the diff looks ok to me =)

(and that's anyway a concern for future diffs)

Thanks!
Omar Polo

> M  lib/worktree.c               |  12+  11-
> M  regress/cmdline/histedit.sh  |  60+   0-
> 
> 2 files changed, 72 insertions(+), 11 deletions(-)
> 
> commit - 4113e6853e3344ea50288e4cd820f0a88b76e37e
> commit + 934cdc3a6c450fb7ccac5f52aa9cc6a5bf9544fe