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

Re: [PATCH 1/4] sequencer: Do not require `allow_empty` for redundant commit options

From
Brian Lyles <brianmlyles@gmail.com>
Date
Jan 21, 2024, 18:19 UTC
Message-ID
<CAHPHrSf3-r4G6X-19GMhMzec5kZbopV+ZvmQ5HHBYPNgH6XZCg@mail.gmail.com>
In-Reply-To
<d6361ecf-82bc-46c6-adfe-3c6ab25d39b2@app.fastmail.com>

On Sat, Jan 20, 2024 at 3:38 PM Kristoffer Haugsbakk <code@khaugsbakk.name> wrote:

Hi Kristoffer, Thank you for taking some time to review my patch.

> Initial discussion (proposal): https://lore.kernel.org/git/CAHPHrSevBdQF0BisR8VK=jM=wj1dTUYEVrv31gLerAzL9=Cd8Q@mail.gmail.com/

I ought to have included this in a cover letter -- thanks for linking it here, and I will include this with v2.

Show 15 quoted lines
> On Fri, Jan 19, 2024, at 06:59, brianmlyles@gmail.com wrote:
> > From: Brian Lyles <brianmlyles@gmail.com>
> >
> > Previously, a consumer of the sequencer that wishes to take advantage of
> > either the `keep_redundant_commits` or `drop_redundant_commits` feature
> > must also specify `allow_empty`.
>
> Previously to this change? It is preferred to describe what the code
> currently does without this change in the present tense.[1] The change
> itself uses the imperative mood.[2]
>
> † 1: SubmittingPatches, “The problem statement that describes the status
>     quo …”
> † 2: SubmittingPatches, “Describe your changes in imperative mood […] as
>     if you are giving orders to the codebase to change its behavior.”

I appreciate the stylistic feedback here. I will tweak this for v2 of the patch.

Show 24 quoted lines
> > In a future commit, an `--empty` option will be added to
> > `git-cherry-pick`, meaning that `drop_redundant_commits` will be
> > available in that command. For that to be possible with the current
> > implementation of the sequencer's `allow_empty()`, `git-cherry-pick`
> > would need to specify `allow_empty` with `drop_redundant_commits` as
> > well, which is an even less intuitive implication of `--allow-empty`: in
> > order to prevent redundant commits automatically, initially-empty
> > commits would need to be kept automatically.
> >
> > Instead, this commit rewrites the `allow_empty()` logic to remove the
> > over-arching requirement that `allow_empty` be specified in order to
> > reach any of the keep/drop behaviors. Only if the commit was originally
> > empty will `allow_empty` have an effect.
>
> In general, phrases like “this commit <verb>” or “this patch <verb>” can
> be rewritten to the “commanding” style (see [2]).[3] But here you’re
> starting a new paragraph after having talked about a future commit, so
> using the commanding style might be stylistically difficult to pull off
> without breaking the flow of the text.
>
> And “this [commit][patch] <verb>” seems to be used with some regularity in
> any case.
>
> 🔗 3: https://lore.kernel.org/git/xmqqedeqienh.fsf@gitster.g/

I think I should be able to adjust this to a more commanding style without breaking the flow. I'll give that a shot in v2 as well.

Show 13 quoted lines
> > Disclaimer: This is my first contribution to the git project, and thus
> > my first attempt at submitting a patch via `git-send-email`. It is also
> > the first time I've touched worked in C in over a decade, and I really
> > didn't work with it much before that either. I welcome any and all
> > feedback on what I may have gotten wrong regarding the patch submission
> > process, the code changes, or my commit messages.
>
> This part (after the commit message) looks like the cover letter for the
> series (the four patches). `SubmittingPatches` recommends submitting that
> in a dedicated email message (for series that have more than one
> patch). Maybe this cover letter style is just an alternative that is
> equally accepted. But most series use a separate cover letter message for
> what it’s worth.

That makes sense -- when I send v2, I can pull this part out into a separate cover letter email.

I will hold off on sending out v2 for a few days to give others a chance to weigh in on this series.

Thanks again, Brian Lyles

Previous: Kristoffer HaugsbakkNext: Phillip Wood
Message 28 of 118 in “sequencer: Do not require `allow_empty` for redundant commit options”
  1. 1/4 sequencer: Do not require `allow_empty` for redundant commit optionsbrianmlyles@gmail.com, Jan 19, 2024
  2. 2/4 docs: Clean up `--empty` formatting in `git-rebase` and `git-am`brianmlyles@gmail.com, Jan 19, 2024
  3. Phillip WoodJan 23, 2024
  4. Brian LylesJan 27, 2024
  5. Phillip WoodFeb 1, 2024
  6. 3/4 rebase: Update `--empty=ask` to `--empty=drop`brianmlyles@gmail.com, Jan 19, 2024
  7. Phillip WoodJan 23, 2024
  8. Brian LylesJan 27, 2024
  9. Phillip WoodFeb 1, 2024
  10. 4/4 cherry-pick: Add `--empty` for more robust redundant commit handlingbrianmlyles@gmail.com, Jan 19, 2024
  11. Kristoffer HaugsbakkJan 20, 2024
  12. Brian LylesJan 21, 2024
  13. Kristoffer HaugsbakkJan 21, 2024
  14. Junio C HamanoJan 21, 2024
  15. Phillip WoodJan 22, 2024
  16. Kristoffer HaugsbakkJan 22, 2024
  17. Brian LylesJan 23, 2024
  18. Kristoffer HaugsbakkJan 23, 2024
  19. Junio C HamanoJan 23, 2024
  20. Subject: [PATCH] CoC: whitespace fixJunio C Hamano, Jan 23, 2024
  21. Elijah NewrenJan 24, 2024
  22. Junio C HamanoJan 23, 2024
  23. Phillip WoodJan 23, 2024
  24. Junio C HamanoJan 23, 2024
  25. Brian LylesJan 28, 2024
  26. Brian LylesJan 27, 2024
  27. Kristoffer HaugsbakkJan 20, 2024
  28. Brian LylesJan 21, 2024
  29. Phillip WoodJan 23, 2024
  30. Junio C HamanoJan 23, 2024
  31. Phillip WoodJan 24, 2024
  32. Phillip WoodJan 24, 2024
  33. Brian LylesJan 27, 2024
  34. Brian LylesJan 28, 2024
  35. Phillip WoodJan 29, 2024
  36. Brian LylesFeb 10, 2024
  37. Phillip WoodFeb 1, 2024
  38. Brian LylesFeb 10, 2024
  39. 0/8 cherry-pick: add `--empty`Brian Lyles, Feb 10, 2024
  40. phillip.wood123@gmail.comFeb 22, 2024
  41. 1/8 docs: address inaccurate `--empty` default with `--exec`Brian Lyles, Feb 10, 2024
  42. 2/8 docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)Brian Lyles, Feb 10, 2024
  43. 3/8 rebase: update `--empty=ask` to `--empty=drop`Brian Lyles, Feb 10, 2024
  44. Brian LylesFeb 11, 2024
  45. Phillip WoodFeb 14, 2024
  46. phillip.wood123@gmail.comFeb 22, 2024
  47. Junio C HamanoFeb 22, 2024
  48. 4/8 sequencer: treat error reading HEAD as unborn branchBrian Lyles, Feb 10, 2024
  49. phillip.wood123@gmail.comFeb 22, 2024
  50. Brian LylesFeb 23, 2024
  51. phillip.wood123@gmail.comFeb 25, 2024
  52. 5/8 sequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles, Feb 10, 2024
  53. phillip.wood123@gmail.comFeb 22, 2024
  54. 6/8 cherry-pick: decouple `--allow-empty` and `--keep-redundant-commits`Brian Lyles, Feb 10, 2024
  55. Phillip WoodFeb 22, 2024
  56. Junio C HamanoFeb 22, 2024
  57. 7/8 cherry-pick: enforce `--keep-redundant-commits` incompatibilityBrian Lyles, Feb 10, 2024
  58. Phillip WoodFeb 22, 2024
  59. Brian LylesFeb 23, 2024
  60. Junio C HamanoFeb 23, 2024
  61. phillip.wood123@gmail.comFeb 25, 2024
  62. Brian LylesFeb 26, 2024
  63. 8/8 cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles, Feb 10, 2024
  64. Jean-Noël AVILAFeb 11, 2024
  65. Brian LylesFeb 12, 2024
  66. phillip.wood123@gmail.comFeb 22, 2024
  67. Brian LylesFeb 23, 2024
  68. phillip.wood123@gmail.comFeb 25, 2024
  69. Brian LylesFeb 26, 2024
  70. Brian LylesFeb 26, 2024
  71. phillip.wood123@gmail.comFeb 27, 2024
  72. Junio C HamanoFeb 27, 2024
  73. 0/7 cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles, Mar 10, 2024
  74. phillip.wood123@gmail.comMar 13, 2024
  75. 1/7 docs: address inaccurate `--empty` default with `--exec`Brian Lyles, Mar 10, 2024
  76. 2/7 docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)Brian Lyles, Mar 10, 2024
  77. 3/7 rebase: update `--empty=ask` to `--empty=stop`Brian Lyles, Mar 10, 2024
  78. 4/7 sequencer: treat error reading HEAD as unborn branchBrian Lyles, Mar 10, 2024
  79. Junio C HamanoMar 11, 2024
  80. Junio C HamanoMar 11, 2024
  81. Brian LylesMar 12, 2024
  82. Junio C HamanoMar 12, 2024
  83. Brian LylesMar 16, 2024
  84. phillip.wood123@gmail.comMar 13, 2024
  85. Brian LylesMar 16, 2024
  86. 5/7 sequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles, Mar 10, 2024
  87. 6/7 cherry-pick: enforce `--keep-redundant-commits` incompatibilityBrian Lyles, Mar 10, 2024
  88. 7/7 cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles, Mar 10, 2024
  89. phillip.wood123@gmail.comMar 13, 2024
  90. Junio C HamanoMar 13, 2024
  91. Brian LylesMar 16, 2024
  92. phillip.wood123@gmail.comMar 20, 2024
  93. 0/7 cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles, Mar 20, 2024
  94. phillip.wood123@gmail.comMar 25, 2024
  95. Brian LylesMar 25, 2024
  96. phillip.wood123@gmail.comMar 25, 2024
  97. Junio C HamanoMar 25, 2024
  98. 1/7 docs: address inaccurate `--empty` default with `--exec`Brian Lyles, Mar 20, 2024
  99. 2/7 docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)Brian Lyles, Mar 20, 2024
  100. 3/7 rebase: update `--empty=ask` to `--empty=stop`Brian Lyles, Mar 20, 2024
  101. 4/7 sequencer: handle unborn branch with `--allow-empty`Brian Lyles, Mar 20, 2024
  102. Dirk GoudersMar 21, 2024
  103. Junio C HamanoMar 21, 2024
  104. Dirk GoudersMar 21, 2024
  105. 5/7 sequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles, Mar 20, 2024
  106. 6/7 cherry-pick: enforce `--keep-redundant-commits` incompatibilityBrian Lyles, Mar 20, 2024
  107. 7/7 cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles, Mar 20, 2024
  108. 0/7 cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles, Mar 25, 2024
  109. phillip.wood123@gmail.comMar 26, 2024
  110. Junio C HamanoMar 26, 2024
  111. phillip.wood123@gmail.comMar 27, 2024
  112. 1/7 docs: address inaccurate `--empty` default with `--exec`Brian Lyles, Mar 25, 2024
  113. 2/7 docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)Brian Lyles, Mar 25, 2024
  114. 3/7 rebase: update `--empty=ask` to `--empty=stop`Brian Lyles, Mar 25, 2024
  115. 4/7 sequencer: handle unborn branch with `--allow-empty`Brian Lyles, Mar 25, 2024
  116. 5/7 sequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles, Mar 25, 2024
  117. 6/7 cherry-pick: enforce `--keep-redundant-commits` incompatibilityBrian Lyles, Mar 25, 2024
  118. 7/7 cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles, Mar 25, 2024

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.