Joey Hess <joey@xxxxxxxxxxx> 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. <http://thread.gmane.org/gmane.comp.version-control.git/159716> 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/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html