From: Junio C Hamano <junkio@cox.net>
Date: Wed, 19 Apr 2006 21:58:24 +0000 (-0700)
Subject: pre-commit hook: complain about conflict markers.
X-Git-Tag: v1.3.1~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=61c2bcbd11e3b66a328b3850c01592e5dc1c67bb;p=git.git

pre-commit hook: complain about conflict markers.

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 <junkio@cox.net>
---

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 43d3b6ef4..723a9ef21 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);