From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 09 Jun 2008 23:23:00 GMT
Subject: Re: [PATCH v2] merge-recursive: respect core.autocrlf
Message-ID: <7vprqqdwh7.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <alpine.DEB.1.00.0806092305430.1783@racer>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>
> 	On Mon, 9 Jun 2008, Junio C Hamano wrote:
>
> 	> Fairly straightforward fix, except that I suspect this needs to 
> 	> be done only for regular files and not symlinks.
> 	> 
> 	> I think entry.c:write_entry() shows how this should be done.
>
> 	Right.  And the relevant clause is actually already there.  D'oh.

Well, you actually have "double d'oh".  "This ought to be a symlink but
the filesystem is lacking, so we instead write out what the readlink from
such a symlink would return" codepath should not convert_to_worktree().

I'll fix it up, no need to resend.  Thanks for the fix.