Commit 11679f83 authored by Ben Boeckel's avatar Ben Boeckel Committed by Brad King

commit-msg: Remove MERGE_HEAD check from msg_is_merge

When using "git commit --amend" to edit a merge commit message the
MERGE_HEAD is long gone.  Also, some Git versions remove this file
before the commit-msg hook is called.  In either case we should still
allow long summary lines that start in 'Merge ' just as we do for
'Revert '.
parent 0d9698a1
......@@ -44,7 +44,6 @@ die() {
# Check the commit message layout with a simple state machine.
msg_is_merge() {
test -f "$GIT_DIR/MERGE_HEAD" &&
echo "$line" | grep "^Merge " >/dev/null 2>&1
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment