Re: git svn rebase problem

From: Matthias Andree <matthias.andree@gmx.de>
Date: May 18, 2009, 08:38 UTC
Message-ID: <op.ut4aagco1e62zd@merlin.emma.line.org>
In-Reply-To: <4A0DDCC5.4010001@dlasys.net>

Am 15.05.2009, 23:21 Uhr, schrieb David H. Lynch J.r <ml@dlasys.net>:

Show 23 quoted lines

> For some time I am using git svn to manage a local copy of a remote svn
> repository.
>
> The svn repository has no branches.
>
> 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?

Have you been working on a branch other than the one that git-svn created for you? If so, you may have to "git checkout" the original branch before being able to "git svn rebase".

Branches and git-svn don't mix.

-- 
Matthias Andree