This is the mail archive of the cygwin mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: git: Tralining whitespace error during commit


Matt Seitz (matseitz <matseitz <at> cisco.com> writes:

> "To solve the problem, you need to edit .git/hooks/pre-commit and
> comment out the following lines:
> 
> if (/\s$/) {
> bad_line("trailing whitespace", $_);
> }"
> 
> Is this the best solution?

It's one approach.

Another is disabling the pre-commit hook in your repository altogether, by 
chmod a-x .git/hooks/pre-commit.

And yet another, which I have been considering doing the next time I package 
git (right now, I'm kind of waiting for git 1.5.3 to come out), is to override 
the upstream git's decision that on cygwin, the templates installed 
in /usr/share/git-core/templates are installed with executable permissions; 
whereas on Linux, they are installed without.  In other words, _somebody_ (not 
me) thought that because windows permissions can't be relied on, that ALL git 
hooks should be enabled by default; whereas on Linux, where permissions are 
reliable, ALL git hooks are disabled by default and you must chmod +x them to 
turn them on.  This seems inconsistent to me, but not to the point that I have 
complained upstream on the git mailing list; perhaps you'd like to raise the 
point there?

> 
> Attachment (cygcheck.out): application/octet-stream, 11 KiB
> 
> When I run "git commit" to check in changes to my

Attaching the contents of your email was rather redundant.  You may want to 
revisit how your mailer is set up.

-- 
Eric Blake
volunteer cygwin git maintainer




--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]