All of lore.kernel.org
 help / color / mirror / Atom feed
From: "David H. Lynch J.r" <ml@dlasys.net>
To: git@vger.kernel.org
Subject: Re: git svn rebase problem
Date: Mon, 18 May 2009 10:06:22 -0400	[thread overview]
Message-ID: <4A116B5E.70206@dlasys.net> (raw)

>2009/5/16 Avery Pennarun <apenwarr@xxxxxxxxx>:
>>/ On Fri, May 15, 2009 at 5:21 PM, David H. Lynch J.r <ml@xxxxxxxxxx> wrote:/
>>/> 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.

	I am using an ssh link

>/> 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.
Aparently I can reproduce this. I have a git repository that is about a year old.
I have made a local copy of it, and tried to run git svn update on it.
After downloading tons of commits it fails in the same way.

if there a way to do a step by step git svn rebase - somethng vaguely like git bisect - some way to zero in on the commit that is screwing things up ?

Or some way to get a log from the rebase AFTER the repository has become trashed

/>
>/ You can probably recover your pre-rebased repository using 'git/
>/ reflog'.

git reflog replies
fatal error bad HEAD
  
> 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@xxxxxxxxxxxxxxx/
>/ More majordomo info at  http://vger.kernel.org/majordomo-info.html/
>
--
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

             reply	other threads:[~2009-05-18 14:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-18 14:06 David H. Lynch J.r [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-05-15 21:21 git svn rebase problem David H. Lynch J.r
2009-05-15 23:53 ` Avery Pennarun
2009-05-16  3:52   ` John Tapsell
2009-05-18  8:38 ` Matthias Andree
2009-05-18 17:00   ` Avery Pennarun
2009-05-19  0:56     ` Miles Bader

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A116B5E.70206@dlasys.net \
    --to=ml@dlasys.net \
    --cc=dhlii@dlasys.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.