From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Aug 2008 01:24:31 GMT
Subject: Re: [PATCH (BUGFIX)] Respect core.autocrlf in combined diff
Message-ID: <7vy72nurw0.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <200808232321.21795.angavrilov@gmail.com>

Alexander Gavrilov <angavrilov@gmail.com> writes:

> 		...
> 		git commit -m aaa
> 		git config core.autocrlf true
> 		git merge b
>
> 	Then look at the output of git diff.

Come to think of it, this test sequence is totally bogus, isn't it?

After making the "aaa" commit, you change core.autocrlf setting, which
means that at that point your work tree is invalid and needs to be checked
out with the right crlf.

IOW, shouldn't you need to do something like this:

 		git commit -m aaa
 		git config core.autocrlf true
+		rm -f .git/index && git reset --hard
		git merge b

for the test sequence to be a valid one that (may or may not) exposes the
problem you are trying to solve?