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

Re: Bypassing hooks while cherry-picking

From
Grégoire PARIS <postmaster@greg0ire.fr>
Date
Mar 3, 2016, 22:20 UTC
Message-ID
<56D8B895.9030308@greg0ire.fr>
In-Reply-To
<xmqqwppj1c83.fsf@gitster.mtv.corp.google.com>

Not sure how cherry-picking is managed, and whether commit is able to see that we are doing a cherry-pick, and end it up properly. Anyway, with Kevin's patch, we should be able to happily use cherry-pick

greg0ire
Le 03/03/2016 22:30, Junio C Hamano a écrit :
Show 15 quoted lines
> greg0ire <postmaster@greg0ire.fr> writes:
>
>> Steps to reproduce :
>>
>> 1. create a pre-commit hook
>> 2. create a commit that fails the hook, and bypass the hook
>> 3. checkout another branch
>> 4. might be optional : create a conflicting change with the previously
>> created commit
>> 5. cherry-pick the commit
>> 6. might be optional : solve the conflick and use git cherry-pick --continue
> Wouldn't "commit --no-verify" at that last step, instead of
> "cherry-pick --continue", just work?
>
>
Previous: Junio C HamanoNext: Junio C Hamano
Message 8 of 10 in “Bypassing hooks while cherry-picking”
  1. greg0ireMar 1, 2016
  2. cherry-pick: add --no-verify optionKevin Daudt, Mar 1, 2016
  3. Eric SunshineMar 2, 2016
  4. cherry-pick: add --no-verify optionKevin Daudt, Mar 2, 2016
  5. Kevin DaudtMar 3, 2016
  6. Grégoire PARISMar 3, 2016
  7. Junio C HamanoMar 3, 2016
  8. Grégoire PARISMar 3, 2016
  9. Junio C HamanoMar 3, 2016
  10. Grégoire PARISMar 3, 2016

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.