From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 114856 invoked by alias); 25 Mar 2015 09:25:03 -0000 Mailing-List: contact cygwin-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner@cygwin.com Mail-Followup-To: cygwin@cygwin.com Received: (qmail 114848 invoked by uid 89); 25 Mar 2015 09:25:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.8 required=5.0 tests=AWL,BAYES_00,RDNS_DYNAMIC,TVD_RCVD_IP autolearn=no version=3.3.2 X-HELO: s87.webhostingserver.nl Received: from 195-211-72-128.webhostingserver.nl (HELO s87.webhostingserver.nl) (195.211.72.128) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 25 Mar 2015 09:25:01 +0000 Received: from loadbalance01.mail.antagonist.nl ([141.138.168.72] helo=proxy06.mail.antagonist.nl) by s87.webhostingserver.nl with esmtp (Exim 4.84) (envelope-from ) id 1YahYX-0007Og-Th for cygwin@cygwin.com; Wed, 25 Mar 2015 10:24:58 +0100 Received: by iecvj10 with SMTP id vj10so17613055iec.0 for ; Wed, 25 Mar 2015 02:24:56 -0700 (PDT) X-Received: by 10.107.47.26 with SMTP id j26mr12417984ioo.36.1427275496166; Wed, 25 Mar 2015 02:24:56 -0700 (PDT) MIME-Version: 1.0 Received: by 10.36.73.38 with HTTP; Wed, 25 Mar 2015 02:24:25 -0700 (PDT) In-Reply-To: <5511CAD2.2020003@oliveyou.net> References: <5511CAD2.2020003@oliveyou.net> From: Frank Fesevur Date: Wed, 25 Mar 2015 11:20:00 -0000 Message-ID: Subject: Re: Cygwin Git thinks files are changed when they aren't To: "cygwin@cygwin.com" Content-Type: text/plain; charset=UTF-8 X-IsSubscribed: yes X-SW-Source: 2015-03/txt/msg00450.txt.bz2 2015-03-24 21:42 GMT+01:00 Chloe: > Cygwin Git always thinks files are changed even when they aren't. After a > commit with a Windows Git, Cygwin Git shows files as modified. > [snip] > $ git diff .project > diff --git a/.project b/.project > old mode 100644 > new mode 100755 Apart from the file mode already mentioned, don't forget that Windows based git uses CRLF as line endings where Cygwin git uses LF as default line ending (like a Linux based git). Could lead to "modified" files as well. I avoid mixed the two as much as possible. I use Cygwin git to do all the real operations and use TortoiseGit (together with Windows based git) just to see in the Windows Explorer what is happening in my directories. There is a tweak introduced in the most recent TortoiseGit to use Cygwin git, but have tried that yet. Regards, Frank -- 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