Re: commit-msg hook does not run on merge with --no-ff option
- From
- Joseph Dunne <jdunne525@gmail.com>
- Date
- Sep 20, 2017, 20:09 UTC
- Message-ID
- <CAC7pkbTU9Ts01p8kDJXqzk2yy=8Y-8dmkGhAkJ96m4D5zCzdRQ@mail.gmail.com>
- In-Reply-To
- <xmqq7ewzwuo6.fsf@gitster.mtv.corp.google.com>
For anyone who stumbles upon this in the future, I found a very simple workaround to force the commit hooks (including commit-msg) to run following a merge operation: Simply create a post-merge hook which triggers an amended commit with no changes.
post-merge hook:
#!/bin/bash git commit --amend -C HEAD
On Fri, Sep 15, 2017 at 3:53 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 12 quoted lines
> Joseph Dunne <jdunne525@gmail.com> writes: > >> 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.