From: Junio C Hamano <gitster@pobox.com>
To: Mike Hommey <mh@glandium.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Fix git reset --abort not restoring the right commit under some conditions
Date: Sat, 01 Mar 2008 19:57:34 -0800 [thread overview]
Message-ID: <7vmyphvkup.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vmyphx3l3.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Sat, 01 Mar 2008 18:27:36 -0800")
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.
prev parent reply other threads:[~2008-03-02 3:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-29 22:08 [PATCH] Add test for git rebase --abort Mike Hommey
2008-02-29 23:26 ` Junio C Hamano
2008-02-29 23:39 ` Johannes Schindelin
2008-03-01 7:36 ` Mike Hommey
2008-03-01 7:41 ` Junio C Hamano
2008-03-01 7:45 ` Mike Hommey
2008-03-01 8:15 ` Mike Hommey
2008-03-01 9:17 ` Junio C Hamano
2008-03-01 10:32 ` [PATCH] Fix git reset --abort not restoring the right commit under some conditions Mike Hommey
2008-03-01 11:11 ` Mike Hommey
2008-03-02 2:27 ` Junio C Hamano
2008-03-02 3:57 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vmyphvkup.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mh@glandium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).