From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 02 Mar 2008 03:57:34 GMT
Subject: Re: [PATCH] Fix git reset --abort not restoring the right commit under some conditions
Message-ID: <7vmyphvkup.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <7vmyphx3l3.fsf@gitster.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Mike Hommey <mh@glandium.org> writes:
>
>> Previously, --abort would end by git resetting to ORIG_HEAD, but some
>> commands, such as git reset --hard (which happened in git rebase --skip,
>> but could just as well be typed by the user), modify ORIG_HEAD.
>>
>> Just use the orig-head we store in $dotest instead.
>
> What happens if we are not using $dotest but .dotest?

Ah, there is an assignment to that variable in that case.  Ok.

The script really needs an overhaul someday.  It got unreadable over
time.