From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Jul 2008 20:40:14 GMT
Subject: Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
Message-ID: <7vod4obahd.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080723011341.GE5904@leksak.fem-net>

Stephan Beyer <s-beyer@gmx.net> writes:

>> Just being a bit defensive -- in this case I think it might be Ok to say
>> "read-tree --reset -u ORIG_HEAD", but I haven't checked in a conflicted
>> case.
>
> Well, the test suite fails:
> ...
> So no reason to be defensive ;)

Ok, so it is not just being defensive but actually is necessary.