X-Recipient: archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 	tests=AWL,BAYES_00,SPF_PASS
X-Spam-Check-By: sourceware.org
Message-ID: <EB50A544D46A44E590CC97C361FFE70C@desktop2>
From: "Sisyphus" <sisyphus1 AT optusnet DOT com DOT au>
To: <cygwin AT cygwin DOT com>, "Matthias Andree" <matthias DOT andree AT gmx DOT de>
References: <8E986D59E88F4C47BD14EA1E4EBB696F AT desktop2> <op DOT u66nqov11e62zd AT merlin DOT emma DOT line DOT org>
In-Reply-To: <op.u66nqov11e62zd@merlin.emma.line.org>
Subject: Re: 'git commit' problem
Date: Wed, 27 Jan 2010 23:03:00 +1100
MIME-Version: 1.0
Content-Type: text/plain; 	format=flowed; 	charset="UTF-8"; 	reply-type=response
Content-Transfer-Encoding: 7bit
X-IsSubscribed: yes
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id: <cygwin.cygwin.com>
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com


----- Original Message ----- 
From: "Matthias Andree" <matthias DOT andree AT gmx DOT de>
To: "Sisyphus" <sisyphus1 AT optusnet DOT com DOT au>; <cygwin AT cygwin DOT com>

>> When I try to 'git commit' my amendments I often get hit with "* 
>> trailing whitespace (line xxx)" errors.
>
> Configure your editor to not leave whitespace at the end of lines 
> (sometimes the features are named flowed mode or soft line breaks or 
> similarly, not always obvious).

Annoyingly, the offending whitespace seems to already be in existence on the 
files (on github) that I'm trying to amend.
Afaict my editor isn't introducing any additional trailing whitespace, but I 
can't commit because of the *pre-existing* trailing whitespace.

Anyway, thanks for the pointers Matthias ... appreciated.

(For the moment, I'm just running some perl code on the file(s) to clean up 
the offending spaces before I commit. It's a bit tedious, but it only needs 
to be done once on each file, and it does enable me to get the job done.)

Cheers,
Rob 


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