From: Liam Clarke <liam.clarke-hutchinson@adscale.co.nz>
Date: Wed, 16 Feb 2011 22:49:43 GMT
Subject: git merge auto-commit doesn't fire pre-commit hook
Message-ID: <1F3B7FF9-6348-4197-A6B7-23C4DA144920@adscale.co.nz>

Hi all, 

How exactly does git merge execute the commit? Does it use --no-verify at all? I've got a pre-commit hook to filter out testing data when merging into master, and if you merge with --no-commit, and then manually commit, the hook fires fine, but when merge autocommits, the hook doesn't get executed at all. Is there any other way to catch this event? I can add --no-commit to the branch.master.mergeoptions I suppose, but I don't want to add too much hassle for our Git users (if they're not checking in test data, of course).

Regards, 

Liam Clarke