git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Fix git reset --abort not restoring the right commit under some conditions

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 2, 2008, 03:57 UTC
Message-ID
<7vmyphvkup.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<7vmyphx3l3.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 9 quoted lines
> 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.

Previous: Junio C Hamano
Message 12 of 12 in “Add test for git rebase --abort”
  1. Add test for git rebase --abortMike Hommey, Feb 29, 2008
  2. Junio C HamanoFeb 29, 2008
  3. Johannes SchindelinFeb 29, 2008
  4. Mike HommeyMar 1, 2008
  5. Junio C HamanoMar 1, 2008
  6. Mike HommeyMar 1, 2008
  7. Mike HommeyMar 1, 2008
  8. Junio C HamanoMar 1, 2008
  9. Fix git reset --abort not restoring the right commit under some conditionsMike Hommey, Mar 1, 2008
  10. Mike HommeyMar 1, 2008
  11. Junio C HamanoMar 2, 2008
  12. Junio C HamanoMar 2, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.