On 5/18/10 1:54 PM, Joe Blaylock wrote:
If you Google something like, say, "git rebase failure recovery" you'll
find that problems like this one aren't that uncommon. While git is
very smart most of the time, every once in a while you find your way
into a corner case where it is very very stupid.
I agree with you. I've tried Google but found nothing that was helpful
to me. I just found this:
http://obfuscatedcode.wordpress.com/2009/03/09/dealing-with-data-corruption-with-git-or-im-famous/
Apparently there are some problems with commit corruption on MacOS.
However I don't know if it applies to me as I'm working inside a VM.
In the past I have both tried doing what Google told me, and
cherry-picked my changes into a new, clean tree. Both have worked ok.
Which is more work seems to depend on the situation. It's good that you
still have your working trees around. This is part of why I branch so
much. (that, and because it's just how I think about things)
Well that's what I was planning to do.
To close this incredibly unhelpful message, I'll suggest that 'git gui',
if you have it installed, may help you untangle what went wrong. Often
when these things happen you can look at the branch structure and see
something out of place. Usually it's a perfectly valid thing to do,
just a strange branching structure, and git just choked because it
looked odd.
Nice. I didn't know about git gui. However it doesn't help with the problem.
I'll also give you links that we found after something like this
happened to Mike recently:
http://www.bluemangolearning.com/blog/2009/03/recovering-from-a-disastrous-git-rebase-mistake/
http://alexscordellis.blogspot.com/2009/07/how-to-recover-lost-commits-in-git.html
Yep, I already know about this operation and it has proven very useful
to me.
Thanks for your answer.
Benoit.
