From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1465 invoked by alias); 4 Sep 2015 14:44:16 -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 1375 invoked by uid 89); 4 Sep 2015 14:44:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.1 required=5.0 tests=AWL,BAYES_20,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wi0-f176.google.com Received: from mail-wi0-f176.google.com (HELO mail-wi0-f176.google.com) (209.85.212.176) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 04 Sep 2015 14:44:14 +0000 Received: by wicfx3 with SMTP id fx3so20370391wic.0 for ; Fri, 04 Sep 2015 07:44:11 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.180.109.169 with SMTP id ht9mr6612531wib.63.1441377851529; Fri, 04 Sep 2015 07:44:11 -0700 (PDT) Received: by 10.28.25.198 with HTTP; Fri, 4 Sep 2015 07:44:11 -0700 (PDT) Date: Fri, 04 Sep 2015 14:44:00 -0000 Message-ID: Subject: Problem with git and file mode changes From: Dani Moncayo To: cygwin@cygwin.com Content-Type: text/plain; charset=UTF-8 X-SW-Source: 2015-09/txt/msg00070.txt.bz2 Hello list, I have installed an up-to-date version of Cygwin on a Windows 8.1 machine: $ uname -a CYGWIN_NT-6.3 LEG570 2.2.1(0.289/5/3) 2015-08-20 11:42 x86_64 Cygwin I have a problem with git. This is the installed version: $ git --version git version 2.5.1 After doing a 'git pull', I saw that git didn't make the merge, because apparently I had some local changes. But I didn't make any local change. For example, this file appears as modified: $ git status --short test/rmailmm.el M test/rmailmm.el $ git diff test/rmailmm.el diff --git a/test/rmailmm.el b/test/rmailmm.el old mode 100644 new mode 100755 Mmm strange, I never changed the permissions of any file in my repo. And moreover: $ ls -o test/rmailmm.el -rwxrwxr--+ 1 Dani 3106 Sep 4 16:19 test/rmailmm.el According to 'ls', the file mode is 774, but according to git is 755. Which one is wrong? Well, let's try to revert the misterious change: $ git checkout test/rmailmm.el $ git status --short test/rmailmm.el M test/rmailmm.el $ git diff test/rmailmm.el diff --git a/test/rmailmm.el b/test/rmailmm.el old mode 100644 new mode 100755 $ ls -o test/rmailmm.el -rwxrwxr--+ 1 Dani 3106 Sep 4 16:28 test/rmailmm.el Apparently nothing has changed after the 'git checkout'!! Do you know what's happening here? TIA -- Dani Moncayo PS: keep my address CC'd, as I'm not subscribed to this list. -- 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