Thread (5 messages) flat view 5 messages, 4 authors, 2016-06-15

Re: git svn rebase problem

From: John Tapsell <hidden>
Date: 2016-06-15 22:46:47

2009/5/16 Avery Pennarun [off-list ref]:
On Fri, May 15, 2009 at 5:21 PM, David H. Lynch J.r [off-list ref] wrote:
quoted
A few days ago I did an
git svn rebase

The rebase took a while and after it completed reported
fatal: bad object HEAD
We had this come up about once a week when using http as the
transport.  After switching most people over to ssh the problems
disappeared.  We never managed to find out why.
quoted
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help