From: Johannes Sixt <johannes.sixt@telecom.at>
To: git@vger.kernel.org
Subject: Re: [PATCH 1/2] Handle core.symlinks=false case in merge-recursive.
Date: Sat, 3 Mar 2007 21:21:59 +0100 [thread overview]
Message-ID: <200703032121.59468.johannes.sixt@telecom.at> (raw)
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
next prev parent reply other threads:[~2007-03-03 20:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-03 19:32 [PATCH 1/2] Handle core.symlinks=false case in merge-recursive Johannes Sixt
2007-03-03 19:38 ` [PATCH 2/2] Tell multi-parent diff about core.symlinks Johannes Sixt
2007-03-03 20:11 ` [PATCH 1/2] Handle core.symlinks=false case in merge-recursive Johannes Schindelin
2007-03-03 20:39 ` Johannes Sixt
2007-03-03 20:44 ` Johannes Schindelin
2007-03-03 20:21 ` Johannes Sixt [this message]
2007-03-04 3:42 ` Junio C Hamano
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=200703032121.59468.johannes.sixt@telecom.at \
--to=johannes.sixt@telecom.at \
--cc=git@vger.kernel.org \
/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