From: Johannes Sixt <j6t@kdbg.org>
To: Joey Hess <joey@kitenet.net>, git@vger.kernel.org
Subject: Re: bug: git merge --no-commit loses track of file modes in the index
Date: Fri, 13 Jun 2014 08:26:19 +0200 [thread overview]
Message-ID: <539A998B.7030200@kdbg.org> (raw)
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
prev parent reply other threads:[~2014-06-13 6:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-13 1:38 bug: git merge --no-commit loses track of file modes in the index Joey Hess
2014-06-13 5:52 ` Stefan Haller
2014-06-13 6:26 ` Johannes Sixt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=539A998B.7030200@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=joey@kitenet.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).