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

Re: [PATCH v3 2/3] t7505: Add tests for cherry-pick and rebase -i/-p

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jan 24, 2018, 18:39 UTC
Message-ID
<CAPig+cRryaafwP4gBLe_6ebWZo12HWtEC6e2CbbP6a5gVh6W4w@mail.gmail.com>
In-Reply-To
<20180124123422.10637-3-phillip.wood@talktalk.net>
On Wed, Jan 24, 2018 at 7:34 AM, Phillip Wood <phillip.wood@talktalk.net> wrote:
Show 20 quoted lines
> Check that cherry-pick and rebase call the 'prepare-commit-msg' hook
> correctly. The expected values for the hook arguments are taken to
> match the current master branch. I think there is scope for improving
> the arguments passed so they make a bit more sense - for instance
> cherry-pick currently passes different arguments depending on whether
> the commit message is being edited. Also the arguments for rebase
> could be improved. Commit 7c4188360ac ("rebase -i: proper
> prepare-commit-msg hook argument when squashing", 2008-10-3) apparently
> changed things so that when squashing rebase would pass 'squash' as
> the argument to the hook but that has been lost.
>
> I think that it would make more sense to pass 'message' for revert and
> cherry-pick -x/-s (i.e. cases where there is a new message or the
> current message in modified by the command), 'squash' when squashing
> with a new message and 'commit HEAD/CHERRY_PICK_HEAD'
> otherwise (picking and squashing without a new message).
>
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
> Reviewed-by: Junio C Hamano <gitster@pobox.com>

Let's drop the Reviewed-by: from me. Although I spotted a minor portability issue while scanning a previous iteration, I did not read the patch closely enough to draw any conclusion of its overall correctness. Normally, a Reviewed-by: is given explicitly by a reviewer when confident that the patch is correct and meets the stated goals.

I suspect that Reviewed-by: Junio ought, similarly, to be dropped.
Previous: Phillip Wood
Message 23 of 23 in “prepare-commit-msg hook no longer run for cherry-pick?”
  1. Dmitry TorokhovJan 5, 2018
  2. Dmitry TorokhovJan 10, 2018
  3. Junio C HamanoJan 10, 2018
  4. Dmitry TorokhovJan 10, 2018
  5. Junio C HamanoJan 10, 2018
  6. 0/2 sequencer: run 'prepare-commit-msg' hookPhillip Wood, Jan 19, 2018
  7. 1/2 t7505: Add tests for cherry-pick and rebase -i/-pPhillip Wood, Jan 19, 2018
  8. Eric SunshineJan 20, 2018
  9. 2/2 sequencer: run 'prepare-commit-msg' hookPhillip Wood, Jan 19, 2018
  10. 0/2 sequencer: run 'prepare-commit-msg' hook​Phillip Wood, Jan 23, 2018
  11. 1/2 t7505: Add tests for cherry-pick and rebase -i/-pPhillip Wood, Jan 23, 2018
  12. Junio C HamanoJan 23, 2018
  13. Junio C HamanoJan 23, 2018
  14. 2/2 sequencer: run 'prepare-commit-msg' hookPhillip Wood, Jan 23, 2018
  15. 0/3 sequencer: run 'prepare-commit-msg' hookPhillip Wood, Jan 24, 2018
  16. 3/3 sequencer: run 'prepare-commit-msg' hookPhillip Wood, Jan 24, 2018
  17. Ramsay JonesJan 24, 2018
  18. Junio C HamanoJan 24, 2018
  19. Phillip WoodJan 25, 2018
  20. Johannes SchindelinJan 29, 2018
  21. 1/3 t7505: style fixesPhillip Wood, Jan 24, 2018
  22. 2/3 t7505: Add tests for cherry-pick and rebase -i/-pPhillip Wood, Jan 24, 2018
  23. Eric SunshineJan 24, 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.