# bug: git merge --no-commit loses track of file modes in the index 3 messages from 2014-06-13 to 2014-06-13. Participants: Joey Hess, Stefan Haller, Johannes Sixt. Thread: https://gitlist.dev/t/36904 ## Joey Hess, 2014-06-13 01:38 Subject: bug: git merge --no-commit loses track of file modes in the index Message-ID: <20140613013858.GA28485@kitenet.net> URL: https://gitlist.dev/e/20140613013858.GA28485%40kitenet.net ``` If git merge --no-commit is used to merge a commit adding a file with an unusual mode -- specifically a symlink which has "mode" 120000, it fails to stage the right mode into the index. This only happens when core.symlinks=false. I noticed it on FAT, but have managed to reproduce it on ext4. Here's an example of the bug: joey@darkstar:~>git clone r1 r2 Cloning into 'r2'... done. joey@darkstar:~>cd r1 joey@darkstar:~/r1>ls -l total 0 lrwxrwxrwx 1 joey joey 11 Jun 12 21:23 foo -> /etc/passwd joey@darkstar:~/r1>git mv foo bar joey@darkstar:~/r1>git commit -m moved [master 516a53c] moved 1 file changed, 0 insertions(+), 0 deletions(-) rename foo => bar (100%) joey@darkstar:~/r1>cd .. joey@darkstar:~>cd r2 joey@darkstar:~/r2>git config core.symlinks false joey@darkstar:~/r2>git fetch origin remote: Counting objects: 2, done. remote: Total 2 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (2/2), done. From /home/joey/r1 7ab8102..516a53c master -> origin/master joey@darkstar:~/r2>git merge origin/master --no-commit --no-ff Automatic merge went well; stopped before committing as requested joey@darkstar:~/r2>git diff --cached diff --git a/bar b/bar new file mode 100644 index 0000000..3594e94 --- /dev/null +++ b/bar @@ -0,0 +1 @@ +/etc/passwd \ No newline at end of file diff --git a/foo b/foo deleted file mode 120000 index 3594e94..0000000 --- a/foo +++ /dev/null @@ -1 +0,0 @@ -/etc/passwd \ No newline at end of file joey@darkstar:~/r2>git commit -m oops [master 63bd960] oops joey@darkstar:~/r2>git show commit 63bd9608c96a91582b27c5853ff58053bab6c71c Merge: 7ab8102 516a53c Author: Joey Hess Date: Thu Jun 12 21:37:35 2014 -0400 oops diff --cc bar index 0000000,3594e94..3594e94 mode 000000,120000..100644 --- a/bar +++ b/bar joey@darkstar:~/r2>git version git version 2.0.0 -- see shy jo ``` ## Stefan Haller, 2014-06-13 05:52 Subject: Re: bug: git merge --no-commit loses track of file modes in the index Message-ID: <1ln65kj.xi5xs1rn4dkiM%lists@haller-berlin.de> URL: https://gitlist.dev/e/1ln65kj.xi5xs1rn4dkiM%25lists%40haller-berlin.de In-Reply-To: <20140613013858.GA28485@kitenet.net> ``` Joey Hess wrote: > If git merge --no-commit is used to merge a commit adding a > file with an unusual mode -- specifically a symlink which has "mode" 120000, > it fails to stage the right mode into the index. > > This only happens when core.symlinks=false. I noticed it on FAT, but > have managed to reproduce it on ext4. This sounds familiar; I wonder if it is related to the problem that git can lose the executable bit when core.filemode is false. I had planned to look into fixing this for years now, as we still run into it once in a while, and it's pretty annoying; but I still didn't get around to it yet. -- Stefan Haller Berlin, Germany http://www.haller-berlin.de/ ``` ## Johannes Sixt, 2014-06-13 06:26 Subject: Re: bug: git merge --no-commit loses track of file modes in the index Message-ID: <539A998B.7030200@kdbg.org> URL: https://gitlist.dev/e/539A998B.7030200%40kdbg.org In-Reply-To: <20140613013858.GA28485@kitenet.net> ``` Am 13.06.2014 03:38, schrieb Joey Hess: > If git merge --no-commit is used to merge a commit adding a > file with an unusual mode -- specifically a symlink which has "mode" 120000, > it fails to stage the right mode into the index. > > This only happens when core.symlinks=false. I noticed it on FAT, but > have managed to reproduce it on ext4. There's a similar breakage with core.filemode=false, which loses the x bit of files that need a content merge. -- Hannes ```