Re: git svn rebase problem

From: Avery Pennarun <apenwarr@gmail.com>
Date: May 15, 2009, 23:53 UTC
Message-ID: <32541b130905151653u436f3c5cwcf1d896c96148efa@mail.gmail.com>
In-Reply-To: <4A0DDCC5.4010001@dlasys.net>

On Fri, May 15, 2009 at 5:21 PM, David H. Lynch J.r <ml@dlasys.net> wrote:

Show 18 quoted lines

> A few days ago I did an
> git svn rebase
>
> The rebase took a while and after it completed reported
> fatal: bad object HEAD
>
> git status reports
> root@hp-dhlii:/usr/src/pico/git# git status
> # Not currently on any branch.
> fatal: bad object HEAD
>
> and git fsck reports
> root@hp-dhlii:/usr/src/pico/git# git fsck
> dangling blob eb3afb4aa3aaf0003bac601a5db4fd76aafa2a87
> dangling commit 5c496db25007c17c325f294bb8324097c9bc407d
>
> How can I recover without downloading the entire repository again which
> could take days?

I don't know how this would happen; it would be great if you could find reproduction steps and send them in, or if you had the complete git rebase log, some of which probably explains the problem.

You can probably recover your pre-rebased repository using 'git reflog'. Look through the reflog to find the commit you want, then do something like

    git checkout whatever-the-commit-id-was-that-you-got-from-git-reflog

and then optionally

    git checkout -b master

Good luck.

Avery