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

2017-09-20 Thread Joseph Dunne
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

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

2017-09-15 Thread Junio C Hamano
Joseph Dunne 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

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

2017-09-15 Thread Joseph Dunne
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 se

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

2017-09-14 Thread Kaartic Sivaraam
On Tue, 2017-09-12 at 13:24 -0500, Joseph Dunne wrote: > Sorry I don't understand your question. The commit-msg hook runs > properly in all cases except when I perform a merge with the --no-ff > option enabled. > It's working just as the documentation says it does (emphasis mine), This hoo

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

2017-09-12 Thread Joseph Dunne
Sorry I don't understand your question. The commit-msg hook runs properly in all cases except when I perform a merge with the --no-ff option enabled. On Mon, Sep 11, 2017 at 12:25 PM, Stefan Beller wrote: > On Mon, Sep 11, 2017 at 7:34 AM, Joseph Dunne wrote: > >> When I merge ... however my co

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

2017-09-11 Thread Stefan Beller
On Mon, Sep 11, 2017 at 7:34 AM, Joseph Dunne wrote: > When I merge ... however my commit-msg hook does not run. (The > commit-msg hook works fine in all other commits / merges.) When using git-commit, but not git-merge? See the discussion of patches at https://public-inbox.org/git/20170907220

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

2017-09-11 Thread Joseph Dunne
I’ve globally configured git master branch to use the –no-ff option in my .gitconfig file: [branch "master"] mergeoptions = “-–no-ff” When I merge a branch into master that would normally be a fast forward merge, the merge happens fine and follows the option –no-ff, creating a new