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

Re: commit-msg hook does not run on merge with --no-ff option

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 15, 2017, 20:53 UTC
Message-ID
<xmqq7ewzwuo6.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CAC7pkbREUZxG0drWVpV43TFv7AVi2agJkRtXZgNsLErk3iBc-w@mail.gmail.com>
Joseph Dunne <jdunne525@gmail.com> writes:
Show 7 quoted lines
> Valid point.  The way my project is set up I always get a conflict on
> merge operations, so technically all my merges (except fast forward
> merges) end with a git-commit, which of course runs the commit-msg
> hook.  It seems everything is working as designed.  Shame there isn't
> a merge-msg hook.
>
> It seems I have no choice but to work around this issue.  Thanks for your help.

I think Stefan wanted to say in his message upthread that with an update still in flight you may not need a workaround.

Previous: Joseph DunneNext: Joseph Dunne
Message 6 of 7 in “commit-msg hook does not run on merge with --no-ff option”
  1. Joseph DunneSep 11, 2017
  2. Stefan BellerSep 11, 2017
  3. Joseph DunneSep 12, 2017
  4. Kaartic SivaraamSep 15, 2017
  5. Joseph DunneSep 15, 2017
  6. Junio C HamanoSep 15, 2017
  7. Joseph DunneSep 20, 2017

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.