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

Re: [PATCH v2] sequencer: beautify subject of reverts of reverts

From
Junio C Hamano <gitster@pobox.com>
Date
May 18, 2023, 16:28 UTC
Message-ID
<xmqqmt21txid.fsf@gitster.g>
In-Reply-To
<10523968-0f02-f483-69c4-24e62e839f70@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 14 quoted lines
>>> (i.e. at that point we stop trying to be clever) rather than
>>>
>>>     Revert "Reapply "Revert some subject""
>>>
>> right.
>>
>> how about filing that under GIGO and extending the comment?
>> i mean, when you actually run into this situation, you should be
>> re-thinking your life choices rather than stressing about git
>> producing a somewhat suboptimal commit message template ...
>
> Given that it is simple to handle this case and Junio is expecting a
> re-roll of this topic[1] then I think it would be worth just adding
> those three lines.

Phillip, your first message with these three lines were a bit dense to understand (in other words, to me, it did not immediately "click" how these lines contribute to avoiding the revert-reapply-revert sequence that is awkward).

But after reading the exchange bewteen you two [*], your suggestion makes quite a lot of sense to me. It is better for a code to behave in a dumb but explainable way, than to attempting and failing to act too clever for its own worth.

Oswald, I do not think GIGO is really an excuse in this case, when the only value of the topic is to make the behaviour less awkward by creating something better than a repeated revert-revert sequence, revert-reapply-revert is worse, as it is markedly harder to guess what it really means for a reversion of revert-revert-revert than "revert" repeated four times. If anything, it is the cleverness of "lets call revert of revert a reapply" code without Phillip's suggestion that creates a garbage output, no?

Thanks.
[Footnote]
 * Oswald, please refrain from using Mail-Followup-To; I wanted to
   deliver the contents of this message specifically to you and
   Phillip, but Phillip's MUA followed your Mail-Followup-To and
   lost your address, which made me look it up and add it myself.
   Please refer to these first before saying "I use it because..."
   if you are going to respond:
   https://lore.kernel.org/git/7v4pndfjym.fsf@assigned-by-dhcp.cox.net/
   https://lore.kernel.org/git/7vei7zjr3y.fsf@alter.siamese.dyndns.org/
Previous: Phillip WoodNext: Linus Arver
Message 13 of 53 in “sequencer: beautify subject of reverts of reverts”
  1. sequencer: beautify subject of reverts of revertsOswald Buddenhagen, Apr 28, 2023
  2. Junio C HamanoApr 28, 2023
  3. Oswald BuddenhagenApr 28, 2023
  4. Junio C HamanoMay 1, 2023
  5. Oswald BuddenhagenMay 1, 2023
  6. Junio C HamanoMay 1, 2023
  7. Junio C HamanoMay 5, 2023
  8. Phillip WoodMay 17, 2023
  9. Oswald BuddenhagenMay 17, 2023
  10. Phillip WoodMay 17, 2023
  11. Oswald BuddenhagenMay 17, 2023
  12. Phillip WoodMay 18, 2023
  13. Junio C HamanoMay 18, 2023
  14. Linus ArverJul 28, 2023
  15. Oswald BuddenhagenJul 28, 2023
  16. Junio C HamanoJul 28, 2023
  17. Oswald BuddenhagenJul 28, 2023
  18. Junio C HamanoJul 28, 2023
  19. Oswald BuddenhagenJul 28, 2023
  20. Linus ArverJul 28, 2023
  21. 1/2 sequencer: beautify subject of reverts of revertsOswald Buddenhagen, Aug 9, 2023
  22. 2/2 doc: revert: add discussionOswald Buddenhagen, Aug 9, 2023
  23. Linus ArverAug 10, 2023
  24. Linus ArverAug 10, 2023
  25. Oswald BuddenhagenAug 11, 2023
  26. Linus ArverAug 11, 2023
  27. Oswald BuddenhagenAug 12, 2023
  28. Linus ArverSep 7, 2023
  29. Phillip WoodAug 11, 2023
  30. Oswald BuddenhagenAug 12, 2023
  31. Junio C HamanoAug 13, 2023
  32. Oswald BuddenhagenAug 14, 2023
  33. Phillip WoodAug 11, 2023
  34. Junio C HamanoAug 11, 2023
  35. Junio C HamanoAug 11, 2023
  36. Re* [PATCH v3 2/2] doc: revert: add discussionJunio C Hamano, Aug 11, 2023
  37. Junio C HamanoAug 11, 2023
  38. rsbecker@nexbridge.comAug 11, 2023
  39. Eric SunshineAug 11, 2023
  40. Oswald BuddenhagenAug 11, 2023
  41. Junio C HamanoAug 11, 2023
  42. Phillip WoodAug 11, 2023
  43. Junio C HamanoAug 11, 2023
  44. Oswald BuddenhagenAug 11, 2023
  45. 1/2 sequencer: beautify subject of reverts of revertsOswald Buddenhagen, Aug 21, 2023
  46. 2/2 git-revert.txt: add discussionOswald Buddenhagen, Aug 21, 2023
  47. Junio C HamanoAug 21, 2023
  48. Taylor BlauAug 23, 2023
  49. Junio C HamanoAug 23, 2023
  50. Oswald BuddenhagenAug 24, 2023
  51. sequencer: beautify subject of reverts of revertsOswald Buddenhagen, Sep 2, 2023
  52. Junio C HamanoSep 2, 2023
  53. Kristoffer HaugsbakkSep 11, 2023

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.