From: Alex Riesen <raa.lkml@gmail.com>
To: Christian Holtje <docwhat@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <junkio@cox.net>
Subject: Re: [PATCH v2] pre-commit hook should ignore carriage returns at EOL
Date: Wed, 25 Jun 2008 20:14:22 +0200 [thread overview]
Message-ID: <20080625181422.GC4039@steel.home> (raw)
In-Reply-To: <3BA781AD-4C44-4F43-902A-07580B6CA075@gmail.com>
Christian Holtje, Tue, Jun 24, 2008 21:21:22 +0200:
> diff --git a/t/t7503-template-hook--pre-commit.sh b/t/t7503-template-
> hook--pre-commit.sh
Your patch has long lines wrapped.
> diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
> index b25dce6..335ca09 100644
> --- a/templates/hooks--pre-commit
> +++ b/templates/hooks--pre-commit
> @@ -55,8 +55,14 @@ perl -e '
> if (s/^\+//) {
> $lineno++;
> chomp;
> - if (/\s$/) {
> - bad_line("trailing whitespace", $_);
> + if (/\r$/) {
> + if (/\s\r$/) {
> + bad_line("trailing whitespace", $_);
> + }
> + } else {
> + if (/\s$/) {
> + bad_line("trailing whitespace", $_);
> + }
You coud just strip the trailing (cr)lf, instead of chomp:
if (s/^\+//) {
$lineno++;
- chomp;
+ s/\r?\n$//so;
if (/\s$/) {
bad_line("trailing whitespace", $_);
Makes for a shorter patch and less code.
next prev parent reply other threads:[~2008-06-25 18:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-24 19:21 [PATCH v2] pre-commit hook should ignore carriage returns at EOL Christian Holtje
2008-06-25 18:14 ` Alex Riesen [this message]
2008-06-25 18:47 ` Christian Holtje
2008-06-25 19:14 ` Junio C Hamano
2008-06-26 2:41 ` Christian Holtje
2008-06-26 22:33 ` Junio C Hamano
2008-06-26 22:34 ` [PATCH 1/5] diff --check: explain why we do not care whether old side is binary Junio C Hamano
2008-06-26 22:35 ` [PATCH 2/5] check_and_emit_line(): rename and refactor Junio C Hamano
2008-06-26 22:36 ` [PATCH 3/5] checkdiff: pass diff_options to the callback Junio C Hamano
2008-06-26 22:36 ` [PATCH 4/5] Teach "diff --check" about a new blank lines at end Junio C Hamano
2008-06-26 22:37 ` [PATCH 5/5] diff --check: detect leftover conflict markers Junio C Hamano
2008-06-26 23:01 ` [PATCH v2] pre-commit hook should ignore carriage returns at EOL Junio C Hamano
2008-06-26 23:06 ` Junio C Hamano
2008-06-27 4:24 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080625181422.GC4039@steel.home \
--to=raa.lkml@gmail.com \
--cc=docwhat@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).