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

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 6, 2018, 01:44 UTC
Message-ID
<xmqqva5bgetj.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CACsJy8AzriX4YYSSZN-U06HHKgL9XmkJ1WhWbLo4LwZvECa8hw@mail.gmail.com>
Duy Nguyen <pclouds@gmail.com> writes:
Show 6 quoted lines
> I think the intent of writing "This reverts .... " to encourage
> writing "because ..." is good, but in practice many people just simply
> not do it. And by not describing anything at all (footers don't count)
> some commit hook can force people to actually write something.
>
> But for the transition period I think we need to keep both anyway,

I do not see any need to qualify the statement with "for the transition period". You showed *no* need to transition, but I do agree that adding a fixed-spelled footer in addition to what we produce in the body is a good idea.

When we know a feature with good intent is not used properly by many people, the first thing to do is not talk about removing it, but to think how we can educate people to make good use of it.

And if we know a feature with good intent is not used by many people but we know that "many" is not "100%", why are we talking about removing it at all?

> Yep. I'll code something up to print both by default with config knobs
> to disable either. Unless you have some better plan of course.

Does it make sense to put both, with exactly the same piece of information? I am not sure whom it would help.

The tools need to be updated to deal with both old and new format if the pick-origin information is used, instead of getting updated to learn new and forget old format, as existing commits in their history do not know about the new format and their tools need to understand them.

I'd say it would be sufficient to have a per-repository knob that says which one to use, and between the release we add that knob and the release we make the new format the default, when we do not see the knob is set to either way, keep warning that in the future the default will change and give advice that the knob can be used to either keep the old format or update to the new format before or after the default switch (in addition to squelch the warning and the advice).

Previous: Duy NguyenNext: Ævar Arnfjörð Bjarmason
Message 22 of 25 in “sequencer.c: record revert/cherry-pick commit with trailer lines”
  1. sequencer.c: record revert/cherry-pick commit with trailer linesNguyễn Thái Ngọc Duy, Nov 4, 2018
  2. Phillip WoodNov 4, 2018
  3. Duy NguyenNov 4, 2018
  4. Phillip WoodNov 4, 2018
  5. Johannes SchindelinNov 5, 2018
  6. sequencer.c: record revert/cherry-pick commit with trailer linesNguyễn Thái Ngọc Duy, Nov 4, 2018
  7. brian m. carlsonNov 4, 2018
  8. Duy NguyenNov 5, 2018
  9. Support --append-trailer in cherry-pick and revertNguyễn Thái Ngọc Duy, Nov 6, 2018
  10. Ævar Arnfjörð BjarmasonNov 6, 2018
  11. Jeff KingNov 6, 2018
  12. Jeff KingNov 6, 2018
  13. Junio C HamanoNov 7, 2018
  14. Duy NguyenNov 7, 2018
  15. Jeff KingNov 7, 2018
  16. Junio C HamanoNov 8, 2018
  17. Jeff KingNov 8, 2018
  18. Junio C HamanoNov 8, 2018
  19. Junio C HamanoNov 7, 2018
  20. Junio C HamanoNov 5, 2018
  21. Duy NguyenNov 5, 2018
  22. Junio C HamanoNov 6, 2018
  23. Ævar Arnfjörð BjarmasonNov 6, 2018
  24. Duy NguyenNov 6, 2018
  25. Ævar Arnfjörð BjarmasonNov 6, 2018

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.