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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Junio C Hamano <gitster@xxxxxxxxx> writes:

> Mike Hommey <mh@xxxxxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux