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

Re: git am and duplicate signatures

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 30, 2016, 16:54 UTC
Message-ID
<xmqqwpiy5haf.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1472573556.5512.93.camel@perches.com>
Joe Perches <joe@perches.com> writes:
Show 11 quoted lines
> git-am -s will avoid duplicating the last signature
> in a patch.
>
> But given a developer creates a patch, send it around for
> acks/other signoffs, collects signatures and then does
> a git am -s on a different branch, this sort of sign-off
> chain is possible:
>
> 	Signed-off-by: Original Developer <od@domain.com>
> 	Acked-by: Random Developer <rd@domain.com>
> 	Signed-off-by: Original Developer <od@domain.com>

Both correct and allowing the earlier one duplicated as long as there is somebody/something else in between is deliberate.

> Should there be an option to avoid duplicate signatures
> in a sequence where an author can git-am the same patch?

I dunno. The way "Signed-off-by" is handled is designed specifically to support the meaning of that footer, namely to record where it originated and whose hands it passed, used in the kernel and Git land. Other projects certainly may have need for footers that denote different things that want different semantics (e.g. Who authored it and who cheered on it), but that is outside the scope of the "Signed-off-by" supported by "am -s" and "commit -s".

Support for more generic footers was supposed to come when the "interpret-trailers" topic started, but the author of the topic seems to have lost interest before the mechanism has become ready to be integrated in the workflow commands like "am", "commit", "rebase" etc., which is unfortunate.

> sequencer.c:append_signoff() has a flag for APPEND_SIGNOFF_DEDUP

Yes, I think this is one of the warts we talked about getting rid of but haven't got around to it. It is there because "format-patch -s" was incorrectly written to dedup Signed-off-by: from anywhere in its early implementation and to keep the same behaviour. We should drop that flag from append_signoff() function.

Previous: Joe PerchesNext: Joe Perches
Message 2 of 11 in “git am and duplicate signatures”
  1. Joe PerchesAug 30, 2016
  2. Junio C HamanoAug 30, 2016
  3. Joe PerchesAug 30, 2016
  4. Junio C HamanoAug 30, 2016
  5. Joe PerchesAug 30, 2016
  6. Junio C HamanoAug 30, 2016
  7. Joe PerchesAug 30, 2016
  8. Joe PerchesAug 30, 2016
  9. Junio C HamanoAug 30, 2016
  10. Joe PerchesAug 30, 2016
  11. Junio C HamanoAug 30, 2016

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.