# Most reliable method to detect a merge commit in pre-commit hook 2 messages from 2012-01-24 to 2012-01-24. Participants: Sebastian Schuberth, Stefan Haller. Thread: https://gitlist.dev/t/29437 ## Sebastian Schuberth, 2012-01-24 14:16 Subject: Most reliable method to detect a merge commit in pre-commit hook Message-ID: URL: https://gitlist.dev/e/jfmegi%24scg%241%40dough.gmane.org ``` Hi, I'd like our pre-commit hook to skip some checks if the commit that's about to be made is a merge commit. What's the most reliable way to detect a merge commit from within a pre-commit hook script? Currently, the only way I see is to check whether .git/MERGE_MSG exists, but I'd feel safer to check whether the commit is going to have more than one parent or so. Is that possible / a better detection? -- Sebastian Schuberth ``` ## Stefan Haller, 2012-01-24 15:10 Subject: Re: Most reliable method to detect a merge commit in pre-commit hook Message-ID: <1kedu51.n7co6x1s8qhdbM%lists@haller-berlin.de> URL: https://gitlist.dev/e/1kedu51.n7co6x1s8qhdbM%25lists%40haller-berlin.de In-Reply-To: ``` Sebastian Schuberth wrote: > I'd like our pre-commit hook to skip some checks if the commit that's > about to be made is a merge commit. What's the most reliable way to > detect a merge commit from within a pre-commit hook script? Currently, > the only way I see is to check whether .git/MERGE_MSG exists, but I'd > feel safer to check whether the commit is going to have more than one > parent or so. Is that possible / a better detection? I haven't found a better way either, so this is the method we use too. The problem is that it fails when you are amending a merge commit; so the output of our pre-commit hook advises the user to manually do a "git commit --no-verify" in that case. -- Stefan Haller Berlin, Germany http://www.haller-berlin.de/ ```