From: Junio C Hamano Date: Wed, 19 Apr 2006 21:59:51 GMT Subject: [PATCH] pre-commit hook: complain about conflict markers. Message-ID: <7vpsjd5iqw.fsf_-_@assigned-by-dhcp.cox.net> In-Reply-To: <7v8xq16y31.fsf@assigned-by-dhcp.cox.net> Several <<< or === or >>> characters at the beginning of a line is very likely to be leftover conflict markers from a failed automerge the user resolved incorrectly, so detect them. As usual, this can be defeated with "git commit --no-verify" if you really do want to have those files, just like changes that introduce trailing whitespaces. Signed-off-by: Junio C Hamano --- templates/hooks--pre-commit | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) 6be63d37efc766756922a9b96ed8fe7a332f133a diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit index 43d3b6e..723a9ef 100644 --- a/templates/hooks--pre-commit +++ b/templates/hooks--pre-commit @@ -61,6 +61,9 @@ perl -e ' if (/^\s* /) { bad_line("indent SP followed by a TAB", $_); } + if (/^(?:[<>=]){7}/) { + bad_line("unresolved merge conflict", $_); + } } } exit($found_bad); -- 1.3.0.g2c4a