From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Sat, 03 Mar 2007 20:21:59 GMT
Subject: Re: [PATCH 1/2] Handle core.symlinks=false case in merge-recursive.
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