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

From: Johannes Sixt <[email-masked]>
Date: Fri, 13 Jun 2014 08:26:19 +0200

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