This is the mail archive of the
cygwin
mailing list for the Cygwin project.
Problem with git and file mode changes
- From: Dani Moncayo <dmoncayo at gmail dot com>
- To: cygwin at cygwin dot com
- Date: Fri, 4 Sep 2015 16:44:11 +0200
- Subject: Problem with git and file mode changes
- Authentication-results: sourceware.org; auth=none
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