{"thread":{"id":"19402","subject":"Re: git svn rebase problem","startedAt":"2009-05-18T14:06:22Z","lastAt":"2009-05-18T14:06:22Z","messageCount":1,"participants":["David H. Lynch J.r"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"114179","messageId":"4A116B5E.70206@dlasys.net","threadId":"19402","inReplyTo":null,"subject":"Re: git svn rebase problem","fromName":"David H. Lynch J.r","fromEmail":"ml@dlasys.net","sentAt":"2009-05-18T14:06:22Z","receivedAt":"2009-05-18T14:06:22Z","isPatch":false,"sender":{"key":"ml@dlasys.net","avatar":null},"body":">2009/5/16 Avery Pennarun <apenwarr@xxxxxxxxx>:\n>>/ On Fri, May 15, 2009 at 5:21 PM, David H. Lynch J.r <ml@xxxxxxxxxx> wrote:/\n>>/> A few days ago I did an/\n>>/> git svn rebase/\n>>/>/\n>>/> The rebase took a while and after it completed reported/\n>>/> fatal: bad object HEAD/\n>\n>We had this come up about once a week when using http as the\n>transport.  After switching most people over to ssh the problems\n>disappeared.  We never managed to find out why.\n\n\tI am using an ssh link\n\n>/> git status reports/\n>/> root@hp-dhlii:/usr/src/pico/git# git status/\n>/> # Not currently on any branch./\n>/> fatal: bad object HEAD/\n>/>/\n>/> and git fsck reports/\n>/> root@hp-dhlii:/usr/src/pico/git# git fsck/\n>/> dangling blob eb3afb4aa3aaf0003bac601a5db4fd76aafa2a87/\n>/> dangling commit 5c496db25007c17c325f294bb8324097c9bc407d/\n>/>/\n>/> How can I recover without downloading the entire repository again which/\n>/> could take days?/\n>\n>/ I don't know how this would happen; it would be great if you could/\n>/ find reproduction steps and send them in, or if you had the complete/\n>/ git rebase log, some of which probably explains the problem.\nAparently I can reproduce this. I have a git repository that is about a year old.\nI have made a local copy of it, and tried to run git svn update on it.\nAfter downloading tons of commits it fails in the same way.\n\nif 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 ?\n\nOr some way to get a log from the rebase AFTER the repository has become trashed\n\n/>\n>/ You can probably recover your pre-rebased repository using 'git/\n>/ reflog'.\n\ngit reflog replies\nfatal error bad HEAD\n  \n> Look through the reflog to find the commit you want, then do/\n>/ something like/\n>\n>/    git checkout whatever-the-commit-id-was-that-you-got-from-git-reflog/\n>\n>/ and then optionally/\n>\n>/    git checkout -b master/\n>\n>/ Good luck./\n>\n>/ Avery/\n>/ --/\n>/ To unsubscribe from this list: send the line \"unsubscribe git\" in/\n>/ the body of a message to majordomo@xxxxxxxxxxxxxxx/\n>/ More majordomo info at  http://vger.kernel.org/majordomo-info.html/\n>\n--\nTo unsubscribe from this list: send the line \"unsubscribe git\" in\nthe body of a message to majordomo@xxxxxxxxxxxxxxx\nMore majordomo info at  http://vger.kernel.org/majordomo-info.html\n"}]}