From c60b528225d2827fd43d4fe4b082e0188df7a280 Mon Sep 17 00:00:00 2001 From: Jean-Luc Herren Date: Mon, 14 Jan 2008 22:47:42 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- templates/hooks--pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit index 7092bae263..b25dce6bbf 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", $_); } } -- 2.11.4.GIT