From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Jul 2008 18:31:54 GMT
Subject: Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
Message-ID: <7v1w1ke9k5.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <488722F5.9030602@free.fr>

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

> Junio C Hamano a écrit :
>>> diff --git a/git-am.sh b/git-am.sh
>> ...
>>> @@ -202,8 +202,15 @@ then
>> ...
>>> +	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
>>> +		;;
>> ...
> I add reset to unstage paths with no conflict that are left behind.

Does removing the last three lines (1) change the behaviour?  (2) break any test?

If the answers are "Yes and No", we would need a few more tests in the
testsuite.

If the answers are "No and naturally no", then let's remove the last three
lines in the hunk.