{"thread":{"id":"11622","subject":"[PATCH] Make default pre-commit hook less noisy","startedAt":"2008-01-14T21:47:42Z","lastAt":"2008-01-14T21:51:45Z","messageCount":2,"participants":["Jean-Luc Herren","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"65340","messageId":"478BD87E.7030606@gmx.ch","threadId":"11622","inReplyTo":null,"subject":"[PATCH] Make default pre-commit hook less noisy","fromName":"Jean-Luc Herren","fromEmail":"jlh@gmx.ch","sentAt":"2008-01-14T21:47:42Z","receivedAt":"2008-01-14T21:47:42Z","isPatch":true,"sender":{"key":"jlh@gmx.ch","avatar":null},"body":"This hook thought to have found a conflict marker any time it saw\na 7-character combination of any of the characters '<>=' at the\nbeginning of a line, whereas it should only look for the *same*\ncharacter to appear repeatedly.\n\nAlso, restrict it to match exactly 7 times, to avoid matching the\nunderlining with '='-characters often used in documentation.\n\nSigned-off-by: Jean-Luc Herren <jlh@gmx.ch>\n---\nAs far as I know, this will still properly match all conflict\nmarkers, even those by cvs or svn.\n\n templates/hooks--pre-commit |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit\nindex 7092bae..b25dce6 100644\n--- a/templates/hooks--pre-commit\n+++ b/templates/hooks--pre-commit\n@@ -61,7 +61,7 @@ perl -e '\n \t    if (/^\\s* \\t/) {\n \t\tbad_line(\"indent SP followed by a TAB\", $_);\n \t    }\n-\t    if (/^(?:[<>=]){7}/) {\n+\t    if (/^([<>])\\1{6} |^={7}$/) {\n \t\tbad_line(\"unresolved merge conflict\", $_);\n \t    }\n \t}\n-- \n1.5.3.8\n"},{"id":"65341","messageId":"7vzlv8hy8e.fsf@gitster.siamese.dyndns.org","threadId":"11622","inReplyTo":"478BD87E.7030606@gmx.ch","subject":"Re: [PATCH] Make default pre-commit hook less noisy","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-01-14T21:51:45Z","receivedAt":"2008-01-14T21:51:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jean-Luc Herren <jlh@gmx.ch> writes:\n\n> This hook thought to have found a conflict marker any time it saw\n> a 7-character combination of any of the characters '<>=' at the\n> beginning of a line, whereas it should only look for the *same*\n> character to appear repeatedly.\n\nI think itt looks good.  Thanks.\n"}]}