From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Git refuses to commit files with DOS EOL Date: Sun, 31 May 2015 12:54:47 -0700 Organization: UCLA Computer Science Department Message-ID: <556B6707.3050701@cs.ucla.edu> References: <83pp5iuxry.fsf@gnu.org> <5569E6E5.4050205@cs.ucla.edu> <836179vrts.fsf@gnu.org> <556A06DA.80008@cs.ucla.edu> <83y4k5uavg.fsf@gnu.org> <556A1225.9070904@cs.ucla.edu> <83pp5gu8iu.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1433102128 27175 80.91.229.3 (31 May 2015 19:55:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 31 May 2015 19:55:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 31 21:55:20 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yz9KG-0000nC-9N for ged-emacs-devel@m.gmane.org; Sun, 31 May 2015 21:55:16 +0200 Original-Received: from localhost ([::1]:43285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz9KF-0002hU-Is for ged-emacs-devel@m.gmane.org; Sun, 31 May 2015 15:55:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz9Jw-0002fZ-He for emacs-devel@gnu.org; Sun, 31 May 2015 15:54:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yz9Jv-0006tG-CM for emacs-devel@gnu.org; Sun, 31 May 2015 15:54:56 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:49558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yz9Jq-0006rI-PX; Sun, 31 May 2015 15:54:50 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 36C68A60004; Sun, 31 May 2015 12:54:49 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dio90im2DvGz; Sun, 31 May 2015 12:54:48 -0700 (PDT) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 3AAA1A60003; Sun, 31 May 2015 12:54:48 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 In-Reply-To: <83pp5gu8iu.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:186967 Archived-At: Eli Zaretskii wrote: > that > page (and numerous others I've seen) all advise to turn on EOL > conversion, which is simply wrong. Shrug. It's right for many projects, probably most. But that's not a topic we need to worry about here. > After reading all that stuff, including the gitattributes man page, I > have only one question: why files like dostorture.c are marked > "-whitespace" and not "whitespace=cr-at-eol"? The latter seems to be > more specific, and still allows detection of trailing whitespace in > files with DOS-style EOL When I wrote that, I was concerned about portability to older versions of git, where the crlf conversion algorithms were different. I didn't want to worry about the hassle of testing this stuff on older Git versions, so I used a conservative (i.e., loose) setting for the CRLF files. If you can verify that a stricter setting based on cr-at-eol is useful on older Git versions on GNUish platforms, feel free to change to the stricter setting. I suggest testing Git 1.7.1 for this, as per .