Thread (67 messages) 67 messages, 5 authors, 4d ago

Re: [PATCH v3 0/9] sequencer: do not record dropped commits as rewritten

From: Junio C Hamano <hidden>
Date: 2026-07-19 19:29:33

Phillip Wood [off-list ref] writes:
Thanks to everyone who commented on v2. I've dropped patch 2 which
Andrei pointed out was pointless and tried to make the remaining
commit messages clearer as requested by Oswald.

If a commit gets dropped because its changes are already upstream
then we should not record it as rewritten. As well as confusing any
post-rewrite hooks this means we end up copying the notes from the
dropped commit to the commit that was picked immediately before the
one that was dropped.

This series is structured as follows:

Patch 1 restores some test coverage that was lost when the default
rebase backend was changed.

Patches 2 & 3 fix the return value of do_pick_commit() when an external
command fails (this is in preparation for patch 8).

Patches 4-7 try and simplify the control flow in pick_one_commit()
in preparation for patch 8.

Patch 8 changes the return type of do_pick_commit() to an enum.

Patch 9 adds a new member to the enum from patch 8 for commits that
are dropped when they become empty and uses that to stop them from
being recorded as rewritten.
I see Phillip Cc'ed everybody who participated in the review for the
previous iterations, which is very much appreciated.

It looks like this is now ready to go?  Any further comments?

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help