On 04.04.24 21:21, Phillip Wood wrote:
I think it is more complicated than that. We do not use the "--signoff" option of "git commit" because we do not want to append the "Signed-off-by:" trailer when processing "fixup" and "squash" commands. The trailer is appended to the commit message by the sequencer in do_pick_commits(). The problem is that when we commit a conflict resolution we end up using the original commit message rather than the file containing the commit message that we would have used if we had not stopped for conflicts. I've got some patches which need their commit messages cleaning up at https://github.com/phillipwood/git/commits/wip/fix-rebase-signoff-with-conflicts/ which use the correct file when committing conflict resolutions. I'll try and clean them up next week.
Took a look at that series, I agree that they fix the issue too. I wasn't aware of the intended behaviour for signoffs in squash and fixup, I'll thus not pursue this patch further.
Thanks for the context and review, David
