X-Recipient: archive-cygwin@delorie.com
X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 	tests=BAYES_00,SPF_PASS
X-Spam-Check-By: sourceware.org
Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes
To: Sisyphus <sisyphus1@optusnet.com.au>, cygwin@cygwin.com
Subject: Re: 'git commit' problem
References: <8E986D59E88F4C47BD14EA1E4EBB696F@desktop2>
Date: Wed, 27 Jan 2010 09:41:02 +0100
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: "Matthias Andree" <matthias.andree@gmx.de>
Message-ID: <op.u66nqov11e62zd@merlin.emma.line.org>
In-Reply-To: <8E986D59E88F4C47BD14EA1E4EBB696F@desktop2>
User-Agent: Opera Mail/10.10 (Linux)
X-IsSubscribed: yes
Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm
Precedence: bulk
List-Id: <cygwin.cygwin.com>
List-Unsubscribe: <mailto:cygwin-unsubscribe-archive-cygwin=delorie.com@cygwin.com>
List-Subscribe: <mailto:cygwin-subscribe@cygwin.com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin@cygwin.com>
List-Help: <mailto:cygwin-help@cygwin.com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner@cygwin.com
Mail-Followup-To: cygwin@cygwin.com
Delivered-To: mailing list cygwin@cygwin.com

Am 27.01.2010, 07:11 Uhr, schrieb Sisyphus:

> Hi,
>
> This might be a general 'git' issue rather than something specific to  
> Cygwin. (The only git I have used is Cygwin's git - version 1.5.4.)

Yes it is a generic git issue.

> 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).

> Firstly, I'm wondering what's wrong with having whitespace at the end of  
> a line ? Why should it prevent changes from being committed ?

Non-printable characters that generate bogus diffs and hence make merging  
more difficult than necessary.

> Secondly, what's the best way to deal with this ? Can this check be  
> easily disabled ?

Yes, check man git-config.

Please ask further questions on this topic on the git@ list.

-- 
Matthias Andree

--
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

