# [PATCH] Make default pre-commit hook less noisy 2 messages from 2008-01-14 to 2008-01-14. Participants: Jean-Luc Herren, Junio C Hamano. Thread: https://gitlist.dev/t/11622 ## Jean-Luc Herren, 2008-01-14 21:47 Subject: [PATCH] Make default pre-commit hook less noisy Message-ID: <478BD87E.7030606@gmx.ch> URL: https://gitlist.dev/e/478BD87E.7030606%40gmx.ch ``` 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 --- As far as I know, this will still properly match all conflict markers, even those by cvs or svn. templates/hooks--pre-commit | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit index 7092bae..b25dce6 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", $_); } } -- 1.5.3.8 ``` ## Junio C Hamano, 2008-01-14 21:51 Subject: Re: [PATCH] Make default pre-commit hook less noisy Message-ID: <7vzlv8hy8e.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vzlv8hy8e.fsf%40gitster.siamese.dyndns.org In-Reply-To: <478BD87E.7030606@gmx.ch> ``` Jean-Luc Herren writes: > 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. I think itt looks good. Thanks. ```