From: Jean-Luc Herren <jlh@gmx.ch>
Date: Mon, 14 Jan 2008 21:47:42 +0000 (+0100)
Subject: Make default pre-commit hook less noisy
X-Git-Tag: v1.5.4-rc4~40
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c60b528225d2827fd43d4fe4b082e0188df7a280;p=git.git

Make default pre-commit hook less noisy

This hook thought to have found a conflict marker any time it saw
a 7-character combination of any of the characters '<>=' at the
beginning of a line, whereas it should only look for the *same*
character to appear repeatedly.

Also, restrict it to match exactly 7 times, to avoid matching the
underlining with '='-characters often used in documentation.

Signed-off-by: Jean-Luc Herren <jlh@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 7092bae26..b25dce6bb 100644
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -61,7 +61,7 @@ perl -e '
 	    if (/^\s* \t/) {
 		bad_line("indent SP followed by a TAB", $_);
 	    }
-	    if (/^(?:[<>=]){7}/) {
+	    if (/^([<>])\1{6} |^={7}$/) {
 		bad_line("unresolved merge conflict", $_);
 	    }
 	}