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

From: Olivier Marin <[email-masked]>
Date: Wed, 23 Jul 2008 14:24:21 +0200

Junio C Hamano a écrit :
>
>> diff --git a/git-am.sh b/git-am.sh
>> index 60aaa4a..864c77e 100755
>> --- a/git-am.sh
>> +++ b/git-am.sh
>> @@ -202,8 +202,15 @@ then
>>  	die "previous rebase directory $dotest still exists but mbox given."
>>  	resume=yes
>>  
>> -	case "$abort" in
>> -	t)
>> +	case "$skip,$abort" in
>> +	t,)
>> +		git rerere clear
>> +		git read-tree --reset -u HEAD HEAD
>> +		orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
>> +		git reset HEAD
>> +		git update-ref ORIG_HEAD $orig_head
>> +		;;
> 
> Sorry, I do not quite understand what this reset after the read-tree dance
> is trying to do; you have already reset the index to the tree in HEAD when
> you cleared the change involved in the patch application with that
> two-tree form of read-tree.

I add reset to unstage paths with no conflict that are left behind. Perhaps
read-tree can clear those paths as well but I do not know how, the man page
is hard to follow.

-- 
Olivier.