Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 23, 2008, 00:48 UTC
Message-ID: <7vbq0pifwq.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080722234703.GD5904@leksak.fem-net>

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

Show 28 quoted lines

> Hi,
>
> Junio C Hamano wrote:
>> Olivier Marin <dkr+ml.git@free.fr> writes:
>> > @@ -203,9 +204,10 @@ then
>> >  
>> >  	case "$abort" in
>> >  	t)
>> > -		rm -fr "$dotest" &&
>> > +		git rerere clear &&
>> >  		git read-tree -m -u ORIG_HEAD &&
> [...]
>> diff --git a/git-am.sh b/git-am.sh
>> index a44bd7a..5cbf8f4 100755
>> --- a/git-am.sh
>> +++ b/git-am.sh
>> @@ -203,9 +203,9 @@ then
>>  
>>  	case "$abort" in
>>  	t)
>> -		rm -fr "$dotest" &&
>> -		git read-tree -m -u ORIG_HEAD &&
>> -		git reset ORIG_HEAD && :
>> +		git rerere clear
>> +		git read-tree --reset -u HEAD ORIG_HEAD
>
> Perhaps I am confused, but ...
> Why is there "HEAD" and "ORIG_HEAD" and not only "ORIG_HEAD"?

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.

If some path was added between ORIG_HEAD (that is where we started from) and HEAD (that is where we are and we decide we do not want it), and that path is conflicted in the index, a single tree form "read-tree --reset -u HEAD" would leave it behind in the working tree, wouldn't it?