From: Johannes Schindelin Date: Mon, 09 Jun 2008 23:35:34 GMT Subject: Re: [PATCH v2] merge-recursive: respect core.autocrlf Message-ID: In-Reply-To: <7vprqqdwh7.fsf@gitster.siamese.dyndns.org> Hi, On Mon, 9 Jun 2008, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Signed-off-by: Johannes Schindelin > > --- > > > > 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 actually thought about that a bit, and just assumed that the rest of the Git code respects autocrlf for "fake" symlinks. IMO it makes no sense at all to write the textual symlink files without CR/LF when the user clearly asked for it with autocrlf = true. After all, it _is_ a text file then. But yes, I tried to save some time and did not check. Ciao, Dscho