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

Re: [PATCH 1/2] Handle core.symlinks=false case in merge-recursive.

From
Johannes Sixt <johannes.sixt@telecom.at>
Date
Mar 3, 2007, 20:21 UTC
Message-ID
<200703032121.59468.johannes.sixt@telecom.at>
In-Reply-To
<200703032032.47158.johannes.sixt@telecom.at>
On Saturday 03 March 2007 20:32, Johannes Sixt wrote:
> If the file system does not support symbolic links (core.symlinks=false),
> merge-recursive must write the merged symbolic link text into a regular
> file.
But how to resolve such a conflict if core.symlinks=false?

It turns out that git-add cannot honor the symlink property recorded in the index because read_cache.c:add_file_to_index() will find only entries at stage 0, but the conflicting entries are at stages 2 and 3. Can there be something done about that?

-- Hannes
Previous: Johannes SchindelinNext: Junio C Hamano
Message 6 of 7 in “Handle core.symlinks=false case in merge-recursive.”
  1. 1/2 Handle core.symlinks=false case in merge-recursive.Johannes Sixt, Mar 3, 2007
  2. 2/2 Tell multi-parent diff about core.symlinks.Johannes Sixt, Mar 3, 2007
  3. Johannes SchindelinMar 3, 2007
  4. Johannes SixtMar 3, 2007
  5. Johannes SchindelinMar 3, 2007
  6. Johannes SixtMar 3, 2007
  7. Junio C HamanoMar 4, 2007

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.