From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Feb 2011 20:01:48 GMT
Subject: Re: [PATCH] do not overwrite untracked symlinks
Message-ID: <7vzkpnbzyr.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110222192632.GB4881@localhost>

Clemens Buchacher <drizzd@aon.at> writes:

> I strongly feel that we should separate the merge process into two
> steps.
>
>  - First, do everything in the index, ignoring the work tree.
>
>  - Second, checkout the index to the work tree while making sure no
>    changes or untracked files get overwritten.

Yes, I think most people who are familiar with the internals agreed on
this long time ago.

> ... But I can't
> get myself to feel good about fixing the function name, but not the
> function.

I think I said what I wanted to say badly.

I agree that the code structure is suboptimal; the badly named function is
just a manifestation of the fact that the abstraction used in the
codepaths involved is not a good one, I think.