git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: Ian Hilt <Ian.Hilt@gmx.com>
Cc: Christian Holtje <docwhat@gmail.com>,
	git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] pre-commit hook should ignore carriage returns at EOL
Date: Tue, 24 Jun 2008 12:05:32 -0700 (PDT)	[thread overview]
Message-ID: <m363rylknc.fsf@localhost.localdomain> (raw)
In-Reply-To: <alpine.LFD.1.10.0806241418360.32759@sys-0.hiltweb.site>

Ian Hilt <Ian.Hilt@gmx.com> writes:

> On Tue, 24 Jun 2008 at 12:23pm -0400, Christian Holtje wrote:

> > --- 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$/) {
> 
> Wouldn't it be less redundant to do a test for \s\r$ here instead of
> testing for \r$ and then \s\r$?

I don't think so, because you want next to test for whitespace
where it _doesn't_ end in \r, i.e. this condition is here
because of the 'else' clause.  IIRC.
-- 
Jakub Narebski
Poland
ShadeHawk on #git

  reply	other threads:[~2008-06-24 19:07 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-24 16:23 [PATCH] pre-commit hook should ignore carriage returns at EOL Christian Holtje
2008-06-24 18:22 ` Alf Clement
2008-06-24 18:26 ` Ian Hilt
2008-06-24 19:05   ` Jakub Narebski [this message]
2008-06-24 19:54     ` Ian Hilt
2008-06-24 20:09       ` Jakub Narebski
2008-06-24 20:36         ` Ian Hilt
2008-06-24 19:16   ` Christian Holtje
2008-06-24 22:31     ` Junio C Hamano
2008-06-24 23:25       ` Christian Holtje
2008-06-24 23:34         ` Jakub Narebski
2008-06-24 23:39           ` Junio C Hamano
2008-06-25  0:19             ` Christian Holtje
2008-06-24 23:59         ` Junio C Hamano
2008-06-25  2:09           ` [PATCH] Ship sample hooks with .sample suffix Junio C Hamano
2008-06-25  2:48             ` Junio C Hamano
2008-06-25  6:51               ` Johannes Sixt
2008-06-25  8:09                 ` Junio C Hamano
2008-06-26  7:19               ` Johannes Sixt
2008-06-26  7:28                 ` Junio C Hamano
2008-06-25  5:18             ` Peter Baumann

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=m363rylknc.fsf@localhost.localdomain \
    --to=jnareb@gmail.com \
    --cc=Ian.Hilt@gmx.com \
    --cc=docwhat@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).