miriup.de

...because open source matters

  • Increase font size
  • Default font size
  • Decrease font size

Recovering a damaged git repository

E-mail Print

Intro

My machine had disk problems. I lost quite a bit of data and it seems I lost one of my git repositories as well.

git log | head
error: Could not read 2e3f651d6fdd1ca7604df1f3b1424a4c67095ccc
fatal: Failed to traverse parents of commit 92a2c1a74048cf8caec7ddd27f943652fab147ac

Analyzing the damage

The ref log apparently is still intact:

$ tail -n 3 .git/logs/refs/heads/master
ba6111ef1ebafac3346f816f36c01bc4af6c2734 03c6b33d82e9e9ec1ecea4985fbe1cca994f44e2 Dirk Tilger  1299783879 +0400 commit: Virgin mono-basic checkin
03c6b33d82e9e9ec1ecea4985fbe1cca994f44e2 2e3f651d6fdd1ca7604df1f3b1424a4c67095ccc Dirk Tilger  1300007389 +0400 commit: Missing efreet dependency
2e3f651d6fdd1ca7604df1f3b1424a4c67095ccc 92a2c1a74048cf8caec7ddd27f943652fab147ac Dirk Tilger  1300007427 +0400 commit: Missing edje dependency

In the list above the first ID is the commit ID, the second ID is the tree ID. The most recent commit is the last one. The commit object 2e3f651d6fdd1ca7604df1f3b1424a4c67095ccc seems damaged:

git log 2e3f651d6fdd1ca7604df1f3b1424a4c67095ccc
fatal: bad object 2e3f651d6fdd1ca7604df1f3b1424a4c67095ccc

The tree object 92a2c1a74048cf8caec7ddd27f943652fab147ac seems intact:

git ls-tree 92a2c1a74048cf8caec7ddd27f943652fab147ac
040000 tree a82504d023fe31e3ed093e58fc4872e5ccd7a4d9    app-portage
040000 tree 0a52ed4638173345b769ec17091db2285849c789    app-text
040000 tree febb17823eb11421f76188d9900c94d6528a6401    app-vim
040000 tree 466e19ae9676334eba999f20e51e6bbea5570933    dev-lang
040000 tree 78dd40b37ebc0cb9ccd59877b08658024416feab    dev-libs
040000 tree 1d60e8774bd1ba9a2170c5507d5357bcfe7bd11d    media-libs
040000 tree 29b1bb0b660a7a7006d2482a9c5703237e2c273f    media-video
040000 tree 5da17094d77e36eb216074117b1fc869aa80b0ce    www-plugins

The commit object 03c6b33d82e9e9ec1ecea4985fbe1cca994f44e2 seems not damaged:

git log --oneline 03c6b33d82e9e9ec1ecea4985fbe1cca994f44e2 | head
03c6b33 Virgin mono-basic checkin
ba6111e Renamed mono ebuild to 9999 version
1fe38af Mono ebuild from the main tree
4835a15 Rename to git ebuild
7ca911f Moonlight ebuild from the main tree
ef843f2 Added odf-converter ebuild from https://bugs.gentoo.org/show_bug.cgi?id=171182
3dce387 g-pypi from my modified pythonhead
1c0ffb8 Compiler plugin for PyLint ( http://www.logilab.org/projects/pylint/ ), a style checking tool for Python.
283897d Awesome. Completion with manual. :
fa38747 vim tasklist greps out TODO and FIXME

The tree object 2e3f651d6fdd1ca7604df1f3b1424a4c67095ccc is damaged:

git ls-tree 2e3f651d6fdd1ca7604df1f3b1424a4c67095ccc
fatal: not a tree object

So to repair this repository all we have to do is to recreate commit 2e3f651d6fdd1ca7604df1f3b1424a4c67095ccc by using the working tree object 92a2c1a74048cf8caec7ddd27f943652fab147ac.

Repairing

What has been lost is one commit object. In theory we might be able to look for a tree object that is not referenced either by another tree object or a commit object. However, as in my case the last two commits actually had been accepted upstream, all I really need to do is to change the tip of my branch to before the damaged commit.

git branch -l before-efreet 03c6b33d82e9e9ec1ecea4985fbe1cca994f44e2

When I now checkout, I still get an error, because it tries to see what needs merging and so on:

git checkout before-efreet
fatal: unable to read tree 78dd40b37ebc0cb9ccd59877b08658024416feab

This can be fixed by forcing the checkout and with having made a backup of everything just before, nothing will get lost.

git checkout -f before-efreet
Last Updated on Tuesday, 05 July 2011 08:02  

Comments   

 
0 #45 Guest 2015-04-25 12:23
That is very attention-grabbing, You are a very skilled blogger.
I've joined your feed and stay up for searching for extra of your
magnificent post. Also, I've shared your website in my social networks

Here is my website: Canadian Pharmacies Shipping To Usa
Quote
 
 
0 #44 Guest 2015-04-21 07:52
It's really a cool and useful piece of info. I am happy that you just shared this helpful information with us.

Please stay us up to date like this. Thanks for sharing.



Check out my website: dyson dc24
Quote
 
 
0 #43 Guest 2015-04-17 21:27
What i do not understood is in fact how you're not
really a lot more smartly-appreciated than you might be now.
You are very intelligent. You already know thus considerably relating to this subject, produced me
individually consider it from so many various angles.
Its like women and men aren't involved except it's something to accomplish with Girl gaga!
Your personal stuffs outstanding. Always take care of it up!


Visit my webpage - cheap flights from las vegas
Quote
 
 
0 #42 Guest 2015-04-09 11:42
Hmm it looks like your website ate my first comment (it was extremely long) so I guess
I'll just sum it up what I submitted and say, I'm
thoroughly enjoying your blog. I as well am an aspiring blog blogger but I'm still new to the whole thing.
Do you have any recommendations for first-time blog writers?
I'd genuinely appreciate it.

Also visit my homepage cheap cialis
Quote
 
 
0 #41 Guest 2015-04-08 14:35
Thank you for some other informative website. The place else may I am getting that type of info written in such an ideal way?
I have a venture that I am simply now running on, and I have been at
the glance out for such info.

Also visit my page :: viagraonline2015shopusa.com/
Quote
 
 
0 #40 Guest 2015-04-05 12:51
Link exchange is nothing else however it is simply placing the other person's
webpage link on your page at proper place and other person will also do same in support of you.


Also visit my page - www.viagrabelgiquefr.com/viagra-levitra-cialis
Quote
 
 
0 #39 Guest 2015-04-02 15:57
Hey There. I discovered your weblog using msn. That is an extremely smartly written article.
I will make sure to bookmark it and return to learn more of your helpful information.
Thank you for the post. I'll certainly comeback.

Stop by my web page :: cialis over counter
Quote
 
 
0 #38 Guest 2015-03-30 12:25
It's difficult to find educated people for this topic,
but you seem like you know what you're talking about!
Thanks

Also visit my webpage; assurance auto
Quote
 
 
0 #37 Guest 2015-02-23 23:20
Have you ever thought about creating an ebook or guest authoring on other blogs?

I have a blog centered on the same topics you discuss and
would really like to have you share some stories/information. I know my viewers would enjoy your work.
If you're even remotely interested, feel free to shoot me an email.


Also visit my web site ... generic viagra canada
Quote
 
 
0 #36 Guest 2015-02-14 20:38
Hi there colleagues, nice piece of writing and good arguments commented at this place, I am really enjoying by these.


Here is my website: drugstore online
Quote
 
 
0 #35 Guest 2015-02-12 19:57
It's truly very difficult in this active life to listen news on Television,
thus I simply use internet for that purpose, and take the most recent news.


Visit my weblog generic viagra
canada
Quote
 
 
0 #34 Guest 2015-01-28 19:07
This article will assist the internet visitors for setting up new weblog or even a blog from start to end.


Stop by my web-site; online pharmacy for cialis
Quote
 
 
0 #33 Guest 2015-01-10 00:31
It is appropriate time to make some plans for the future
and it is time to be happy. I've read this post and if I could
I wish to suggest you some interesting things or suggestions.
Maybe you could write next articles referring to this article.
I wish to read more things about it!

Stop by my blog - walgreens drug store
Quote
 
 
0 #32 Guest 2014-12-16 11:02
Its like you read my mind! You appear to know so much about this, like you wrote the book in it or something.
I think that you can do with a few pics to drive the message home
a bit, but instead of that, this is fantastic blog. An excellent
read. I will certainly be back.

my site; webpage (Aleisha)
Quote
 
 
-1 #31 Guest 2014-11-12 04:30
Hello,you say how to resolt the question, and it is very usefull.
But I want to know the reason why this question is generated, thanks.
Quote
 
 
-1 #30 Guest 2014-11-11 07:40
My brother suggested I would possibly like this blog.
He was once totally right. This publish truly made my day.
You can not consider simply how a lot time I had spent for
this info! Thank you!

Here is my blog ... canada viagra generic
Quote
 
 
-1 #29 Guest 2014-10-23 06:18
May I simply just say what a relief to uncover a person that
really understands what they are discussing on the web.

You certainly realize how to bring an issue to light and make it important.

More and more people really need to check this out and understand this side
of the story. It's surprising you aren't more popular since you definitely possess the gift.



My page :: buy generic cialis in canada
Quote
 
 
-1 #28 Guest 2014-10-06 07:16
Valuable info. Fortunate me I disscovered yur webite accidentally, and I'm shocked why thiks accident did not happened earlier!
I bookmarked it.

My bloig post Social Media
Marketing Trends
Quote
 
 
-1 #27 Guest 2014-10-04 11:15
I read this post fully on the topic of the resemblance of
most up-to-date and preceding technologies, it's remarkable article.


My blog post - canadian generic cialis
Quote
 
 
-1 #26 Guest 2014-09-24 22:27
Good site you've got here.. It's hard to find quality writing like yours these days.
I honestly appreciate people like you! Take care!!

Also visit my web-site ... www.161992up.com
Quote
 

Add comment


Security code
Refresh