Re: bug: git merge --no-commit loses track of file modes in the index

2014-06-12 Thread Johannes Sixt
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" 12, it fails to stage the right mode into the index. This only happens when core.symlinks=false. I noticed it on FAT, but h

Re: bug: git merge --no-commit loses track of file modes in the index

2014-06-12 Thread Stefan Haller
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" 12, > it fails to stage the right mode into the index. > > This only happens when core.symlinks=false. I noticed it on FAT, but > have manage

bug: git merge --no-commit loses track of file modes in the index

2014-06-12 Thread 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" 12, 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. Her