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

Re: [PATCH v7 0/2] mergetool: add automerge configuration

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 28, 2020, 10:29 UTC
Message-ID
<xmqqsg7qjk9q.fsf@gitster.c.googlers.com>
In-Reply-To
<20201228004152.522421-1-seth@eseth.com>
Seth House <seth@eseth.com> writes:
>    * Signed off on Felipe's commit. (Although I have minor qualms with
>      Felipe's various wording and even the name of the flag it is
>      decidedly not worth burdening the list with bike-shedding.)

Even when the original is a horrible patch in your opinion that is laden with bugs, as long as the original author signed it off (which means that the original author certifies that it can be included in and distributed by the project under our licensing terms, and agrees to the fact that the original author did so will be recorded in perpetuity), you can relay such a patch as-is, and you are required (i.e. SubmittingPatches is pretty clear that without your sign-off we cannot accept) to sign it off to record the provenance of the code.

The other side of the above coin is that you are not endorsing or vounching for the patch when you sign it off, so your name is not smudged by wording and flag name chosen in a way that you may consider poor. So "Although..." part is not a good objection against signing it off.

In other words, sign-off is not about assuring quality.

Also, instead of relaying as-is, you can relay a patch with your improvements rolled into the same patch (i.e. not as follow-up fixes). Some (or major) parts of the original patch may still remain in the edited result and you'd need to keep original author's sign-off as-is [*1*].

In this topic's case, 2/2 would be a feature enhancement on top of 1/2, so relaying 1/2 as-is would be OK, but in a case where an promising patch was sent with sign-off and bugs, then gets abandoned by the original author, fixing the bug in the patch you relay in place (i.e. not as follow-up patches) may even be necessary to keep bisectability. When you do so, you'd typically do:

	Subject: [PATCH] title of the patch
	... original author's log message, possibly copyedited
	... by you
+	<Comment on what you did on top of the original can come here>
	Signed-off-by: Original Author <ori@ginal.au.thor>
+	[or brief comment here]
+	Signed-off-by: Your Name <you@your.do.main>
 (1) add your sign-off at the end
 (2) explain what you changed relative to the original, either
     inside [] on the line before your sign-off, or at the end
     of the log message proper.

to indicate that it is not relayed as-is; this allows you to take responsibility of an unintended breakage your "fixes" might have caused.

[Footnote]

*1* The result may become something that no longer aligns the original author's opinion, but that is OK. The sign-off by the original author just says that the original author has the right to contribute (the remaining part of) the patch and the original author agrees that the record of author's involvement in the patch (including sign-off) will be kept.

It is not about assuring quality of the final work by the original author, either.

Previous: Seth HouseNext: Felipe Contreras
Message 78 of 80 in “mergetool: remove unconflicted lines”
  1. 0/1 mergetool: remove unconflicted linesFelipe Contreras, Dec 23, 2020
  2. 1/1 mergetool: add automerge configurationFelipe Contreras, Dec 23, 2020
  3. Junio C HamanoDec 23, 2020
  4. Felipe ContrerasDec 23, 2020
  5. Junio C HamanoDec 23, 2020
  6. Felipe ContrerasDec 24, 2020
  7. Junio C HamanoDec 24, 2020
  8. Felipe ContrerasDec 24, 2020
  9. Junio C HamanoDec 24, 2020
  10. Felipe ContrerasDec 24, 2020
  11. Junio C HamanoDec 24, 2020
  12. Felipe ContrerasDec 27, 2020
  13. Junio C HamanoDec 24, 2020
  14. Felipe ContrerasDec 24, 2020
  15. Johannes SchindelinDec 30, 2020
  16. Felipe ContrerasDec 30, 2020
  17. 0/1 mergetool: add automerge configurationSeth House, Dec 27, 2020
  18. 2/2 mergetool: Add per-tool support for the autoMerge flagSeth House, Dec 27, 2020
  19. Junio C HamanoDec 27, 2020
  20. 1/2 mergetool: add automerge configurationSeth House, Dec 27, 2020
  21. Junio C HamanoDec 27, 2020
  22. Seth HouseDec 27, 2020
  23. Junio C HamanoDec 27, 2020
  24. 0/2 mergetool: add automerge configurationSeth House, Dec 28, 2020
  25. 2/2 mergetool: Add per-tool support for the autoMerge flagSeth House, Dec 28, 2020
  26. Felipe ContrerasDec 28, 2020
  27. 1/2 mergetool: add automerge configurationSeth House, Dec 28, 2020
  28. 0/4 mergetool: add automerge configurationSeth House, Dec 28, 2020
  29. 1/4 mergetool: add automerge configurationSeth House, Dec 28, 2020
  30. Johannes SixtDec 28, 2020
  31. 2/4 mergetool: Add per-tool support for the autoMerge flagSeth House, Dec 28, 2020
  32. Junio C HamanoDec 28, 2020
  33. 4/4 mergetool: Add automerge_enabled tool-specific override functionSeth House, Dec 28, 2020
  34. Johannes SixtDec 28, 2020
  35. Junio C HamanoDec 28, 2020
  36. 3/4 mergetool: Break setup_tool out into separate initialization functionSeth House, Dec 28, 2020
  37. Johannes SixtDec 28, 2020
  38. 0/5 mergetool: add automerge configurationSeth House, Dec 28, 2020
  39. 5/5 mergetool: add automerge_enabled tool-specific override functionSeth House, Dec 28, 2020
  40. Felipe ContrerasDec 29, 2020
  41. Junio C HamanoJan 6, 2021
  42. Seth HouseJan 7, 2021
  43. Junio C HamanoJan 7, 2021
  44. Seth HouseJan 7, 2021
  45. Junio C HamanoJan 7, 2021
  46. Johannes SchindelinJan 8, 2021
  47. 3/5 mergetool: add per-tool support for the autoMerge flagSeth House, Dec 28, 2020
  48. 4/5 mergetool: break setup_tool out into separate initialization functionSeth House, Dec 28, 2020
  49. Johannes SixtDec 29, 2020
  50. Seth HouseDec 29, 2020
  51. 2/5 mergetool: alphabetize the mergetool config docsSeth House, Dec 28, 2020
  52. 1/5 mergetool: add automerge configurationSeth House, Dec 28, 2020
  53. 0/3 mergetool: add hideResolved configuration (was automerge)Seth House, Jan 30, 2021
  54. 3/3 mergetool: add per-tool support and overrides for the hideResolved flagSeth House, Jan 30, 2021
  55. Junio C HamanoJan 30, 2021
  56. 2/3 mergetool: break setup_tool out into separate initialization functionSeth House, Jan 30, 2021
  57. 1/3 mergetool: add hideResolved configurationSeth House, Jan 30, 2021
  58. Junio C HamanoJan 30, 2021
  59. 0/3 mergetool: add hideResolved configuration (was automerge)Seth House, Feb 9, 2021
  60. 2/3 mergetool: break setup_tool out into separate initialization functionSeth House, Feb 9, 2021
  61. 1/3 mergetool: add hideResolved configurationSeth House, Feb 9, 2021
  62. mergetool: do not enable hideResolved by defaultJonathan Nieder, Mar 9, 2021
  63. Seth HouseMar 9, 2021
  64. Jonathan NiederMar 10, 2021
  65. Junio C HamanoMar 10, 2021
  66. Junio C HamanoMar 11, 2021
  67. Junio C HamanoMar 12, 2021
  68. Jonathan NiederMar 12, 2021
  69. Junio C HamanoMar 12, 2021
  70. 0/2 mergetool: do not enable hideResolved by defaultJonathan Nieder, Mar 13, 2021
  71. 1/2 mergetool: do not enable hideResolved by defaultJonathan Nieder, Mar 13, 2021
  72. 2/2 doc: describe mergetool configuration in git-mergetool(1)Jonathan Nieder, Mar 13, 2021
  73. Junio C HamanoMar 13, 2021
  74. Junio C HamanoMar 13, 2021
  75. 3/3 mergetool: add per-tool support and overrides for the hideResolved flagSeth House, Feb 9, 2021
  76. Junio C HamanoFeb 9, 2021
  77. Seth HouseFeb 9, 2021
  78. Junio C HamanoDec 28, 2020
  79. Felipe ContrerasDec 28, 2020
  80. Felipe ContrerasDec 28, 2020

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.