git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Johannes Sixt <j6t@kdbg.org>
Date
Jun 13, 2014, 06:26 UTC
Message-ID
<539A998B.7030200@kdbg.org>
In-Reply-To
<20140613013858.GA28485@kitenet.net>
Am 13.06.2014 03:38, schrieb Joey Hess:
Show 6 quoted lines
> 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
Previous: Stefan Haller
Message 3 of 3 in “bug: git merge --no-commit loses track of file modes in the index”
  1. Joey HessJun 13, 2014
  2. Stefan HallerJun 13, 2014
  3. Johannes SixtJun 13, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.