Re: What's cooking in git.git (Jun 2010, #04; Wed, 23)

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 24, 2010, 20:21 UTC
Message-ID: <7veifwchb6.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100624111757.GB3453@pvv.org>

Finn Arne Gangstad <finnag@pvv.org> writes:

Show 13 quoted lines

> On Wed, Jun 23, 2010 at 03:09:32PM -0700, Junio C Hamano wrote:
>
>> * eb/double-convert-before-merge (2010-06-16) 1 commit
>>  - ll-merge: Normalize files before merging
>> 
>> If running git-to-worktree and then worktree-to-git _fixes_ something, it
>> means that these are not roundtrip operations; there is something that is
>> fundamentally wrong.  The commit log message doesn't help explaining it,
>> either.
>
> If .gitattributes is different on the different sides, or if you
> enable autocrlf, the current repo contents may change after
> git-to-worktree and worktree-to-git again.

IOW, g2w-then-w2g may not be an identity function.

If we were to encourage use of this codepath to wider audiences, we may need to have a document for people who write smudge/clean filters. In order for the result to be stable, applying g2w-then-w2g once again on top of the result of running g2w-then-w2g on anything should be no-op, no?