git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] sequencer: honor signoff opt in run_git_commit

From
DBDavid Bimmler <david.bimmler@isovalent.com>
Date
Apr 5, 2024, 11:50 UTC
Message-ID
<6e40f19c-21c3-4a7b-876f-b8161a85e603@isovalent.com>
In-Reply-To
<a80a5aa9-34f4-4bfe-9e32-7b5e878554ba@gmail.com>
On 04.04.24 21:21, Phillip Wood wrote:
Show 10 quoted lines
> 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

Previous: Phillip Wood
Message 6 of 6 in “sequencer: honor signoff opt in run_git_commit”
  1. sequencer: honor signoff opt in run_git_commitDavid Bimmler via GitGitGadget, Apr 4, 2024
  2. Junio C HamanoApr 4, 2024
  3. Junio C HamanoApr 4, 2024
  4. Phillip WoodApr 4, 2024
  5. Phillip WoodApr 4, 2024
  6. David BimmlerApr 5, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.