Re: Recovering Committed Changes in a Detached Head?
"Joel C. Salomon" <joelcsalomon@gmail.com> wrote:
Show 22 quoted lines
>On 10/08/2011 06:00 PM, Martin Fick wrote:
>>> git reflog to the rescue.
><snip>
>>> There you see the first line of the commit message from your "lost"
>>> commit, and you can do
>>>
>>> git checkout -b lost_detached_head 92aa5381
>>>
>>> and you get a branch pointing to that commit you made while on
>>> detached head, and you can work with it as usual.
>>
>> While rflog is cool, I can't help but think that git could be even
>more helpful for these scenarios.
>>
>> First, maybe git could create refs for these automatically, perhaps
>with a name like orphans/1? Maybe these refs would only be visible via
>git branch --orphans.
>
>Creating these "orphan" refs would require the equivalent of (part of)
>git-fsck; I can't imagine that could be imposed without significant
>overhead on too many operations. I think you'd be better off wrapping
>git-fsck in a script that can create these branches.
Is there another way to create orphan refs than by doing a checkout and leaving the orphan behind? I guess a rebase or other branch rewinding operations, but shouldn't it already know on those that that if it alters anything, it will create an orphan? Git already checks for to see if it is leaving orphan refs behind on a checkout, why not just give the orphan a branch name at those points (not sure what to do if the check is bypassed with -q, just punt I guess)?
-Martin
Employee of Qualcomm Innovation Center,Inc. which is a member of Code Aurora Forum