From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Jul 2008 00:16:38 GMT
Subject: Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
Message-ID: <7vk5fdiheh.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <4884917A.1060005@free.fr>

Olivier Marin <dkr+ml.git@free.fr> writes:

> The last thing that still annoy me is the --skip that refuse to skip in 3-way
> merge. Perhaps we can use the "git read-tree --reset -u" thing for skip too.

Hmm...

We traditionally left that as something the user deliberately should do to
signal --skip that the user knows he is dropping that change (by the way,
so did "git-rebase").  But with fb6e4e1 (Do git reset --hard HEAD when
using git rebase --skip, 2007-11-08), we run the reset upon rebase --skip,
so it probably is a good idea to match it here as well.

> 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.