git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: David Bimmler <david.bimmler@isovalent.com>
To: phillip.wood@dunelm.org.uk, Junio C Hamano <gitster@pobox.com>,
	David Bimmler via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] sequencer: honor signoff opt in run_git_commit
Date: Fri, 5 Apr 2024 13:50:41 +0200	[thread overview]
Message-ID: <6e40f19c-21c3-4a7b-876f-b8161a85e603@isovalent.com> (raw)
In-Reply-To: <a80a5aa9-34f4-4bfe-9e32-7b5e878554ba@gmail.com>

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



      reply	other threads:[~2024-04-05 11:50 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-04  9:39 [PATCH] sequencer: honor signoff opt in run_git_commit David Bimmler via GitGitGadget
2024-04-04 16:22 ` Junio C Hamano
2024-04-04 16:45   ` Junio C Hamano
2024-04-04 19:22     ` Phillip Wood
2024-04-04 19:21   ` Phillip Wood
2024-04-05 11:50     ` David Bimmler [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6e40f19c-21c3-4a7b-876f-b8161a85e603@isovalent.com \
    --to=david.bimmler@isovalent.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=phillip.wood@dunelm.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).