delorie.com/archives/browse.cgi   search  
Mail Archives: cygwin/2015/09/04/10:44:33

X-Recipient: archive-cygwin AT delorie DOT com
DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id
:list-unsubscribe:list-subscribe:list-archive:list-post
:list-help:sender:mime-version:date:message-id:subject:from:to
:content-type; q=dns; s=default; b=TS3RAJTVUwnszAn7JKuhc/B7Irt55
1hPzZR9KFkOvcjG5qgZevhLaV6T/FShLUeZi5YKYypTyQ9lOXLYuolyMYaQ1TWO3
WFneEds07wY4pIZrtzC5UiT3a1USdz0PM6BHSBHPF3jCvWialyRZ/yPo7vHEY/B2
QPHJwzZ2ySncZo=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id
:list-unsubscribe:list-subscribe:list-archive:list-post
:list-help:sender:mime-version:date:message-id:subject:from:to
:content-type; s=default; bh=/oTv9D9aSCH0TvZGA8XDMJ00pVM=; b=sFx
kbNbYi4nMytrZYyBb5YIV1Gix55F2UpWa6LzOifbaLI4bFZKsuH2IqfVqO+XOHmY
rgAp4e7jKGKbTB+5bEYe5aQUlMvI4+wpLT2IpbKTEHuCY8B6dNuqU10qn44Ik6Ch
8naXTHfpoHwlnc0b0x5YCiZ4aZbLPKpI/YTzz7SI=
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
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
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)
Date: Fri, 4 Sep 2015 16:44:11 +0200
Message-ID: <CAH8Pv0jXEEJ5P4jmojYne_SAt-DtK7twGLuujFCukoAhr1-f8g@mail.gmail.com>
Subject: Problem with git and file mode changes
From: Dani Moncayo <dmoncayo AT gmail DOT com>
To: cygwin AT cygwin DOT com

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

- Raw text -


  webmaster     delorie software   privacy  
  Copyright © 2019   by DJ Delorie     Updated Jul 2019