# [PATCH] allow a single form feed in pre commit hook 3 messages from 2007-12-18 to 2007-12-18. Participants: Hannes Eder, Junio C Hamano, Jakub Narebski. Thread: https://gitlist.dev/t/11338 ## Hannes Eder, 2007-12-18 09:47 Subject: [PATCH] allow a single form feed in pre commit hook Message-ID: <5d2716640712180147x36aa3178ja8658e30842c4e52@mail.gmail.com> URL: https://gitlist.dev/e/5d2716640712180147x36aa3178ja8658e30842c4e52%40mail.gmail.com ``` It's not uncommon to have a lines with a single form feed in it, e.g. the default GPL COPYING and also in .c files and others. Attached patch allows this in the pre-commit hook. -Hannes From 454ede83f7a45741d825f0b6cbdb0be2ac235fdb Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Tue, 18 Dec 2007 10:21:11 +0100 Subject: [PATCH] allow a lines with just one form feed in pre-commit hook diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit index 7092bae..a759f92 100644 --- a/templates/hooks--pre-commit +++ b/templates/hooks--pre-commit @@ -55,7 +55,7 @@ perl -e ' if (s/^\+//) { $lineno++; chomp; - if (/\s$/) { + if (!/^\f$/ && /\s$/) { bad_line("trailing whitespace", $_); } if (/^\s* \t/) { ``` ## Junio C Hamano, 2007-12-18 10:18 Subject: Re: [PATCH] allow a single form feed in pre commit hook Message-ID: <7v4peg1f33.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4peg1f33.fsf%40gitster.siamese.dyndns.org In-Reply-To: <5d2716640712180147x36aa3178ja8658e30842c4e52@mail.gmail.com> ``` "Hannes Eder" writes: > It's not uncommon to have a lines with a single form feed in it, e.g. > the default GPL COPYING and also in .c files and others. Attached > patch allows this in the pre-commit hook. Hmm. The current trend is to get rid of the whitespace checks from this hook and enrich git-diff --check and git-apply --whitespace=error. I've been planning to add a new whitespace error rule that allows ^M at the end of line, post 1.5.4. Another rule that allows a lone ^L would match what you are doing here, and it would be a good addition as well. ``` ## Jakub Narebski, 2007-12-18 10:27 Subject: Re: [PATCH] allow a single form feed in pre commit hook Message-ID: URL: https://gitlist.dev/e/m3prx4paam.fsf%40roke.D-201 In-Reply-To: <7v4peg1f33.fsf@gitster.siamese.dyndns.org> ``` Junio C Hamano writes: > "Hannes Eder" writes: > > > It's not uncommon to have a lines with a single form feed in it, e.g. > > the default GPL COPYING and also in .c files and others. Attached > > patch allows this in the pre-commit hook. > > Hmm. The current trend is to get rid of the whitespace checks from this > hook and enrich git-diff --check and git-apply --whitespace=error. > > I've been planning to add a new whitespace error rule that allows ^M at > the end of line, post 1.5.4. Another rule that allows a lone ^L would > match what you are doing here, and it would be a good addition as well. There probably should also be 'trailing-empty-lines' rule; also 'eol-at-eof' could be useful as well (ensuring that final line ends with newline character). By the way, the check in pre-commit hook also checks for merge conflict markers. Those are not whitespace errors, but are quite similar. It would be nice to have this also .gitattributes controlled, to avoid false positoves for changes in Documentation/*.txt; althought perhaps more strict checking would be enough... -- Jakub Narebski Poland ShadeHawk on #git ```