> > > > I hit a quota limit on a disk my tree was on, but did not notice. > > Doing git pull on a tree seems to have corrupted it. > > Now I have: > > > > $ git-fsck-objects > > error: 4d4d30be967d3284cbf59afd4fba6ab536e295f5: object not found > > error: c03590b581d51d5fa43adbef9415e935d0229412: object not found > > missing tree 10147d79b2418168d9433067b6439971bd4f1261 > > broken link from commit 322a6c93ad86d2a151dd97a4c6b0e014a4893437 > > to tree 10147d79b2418168d9433067b6439971bd4f1261 > > dangling commit 322a6c93ad86d2a151dd97a4c6b0e014a4893437 > > > > The tree can not be pulled into, or from. > > That's nasty, but something as simple a "git reset --hard ORIG_HEAD" > should fix it (of course, if the disk-full happened earlier, or you've > done some other reset or something else that over-write your ORIG_HEAD, > you'd need to find the most recent commit that wasn't broken). > > The good news is that there's no way your old data got corrupted. You just > need to _find_ it (and normally ORIG_HEAD points to it, so it's trivial to > find). I did lots of resets and they did not seems to help. Then, on a hunch, I just did git prune and it cleaned the tree so I can pull/push fine. How come? mst@mst-lt:~/tmp/libmthca_bad$ git --version git version 1.5.0.rc0.g244a7 mst@mst-lt:~/tmp/libmthca_bad$ git pull ~/scm/libmthca/ remote: Generating pack... remote: Done counting 18 objects. Result has 11 objects. remote: Deltifying 11 objects. remote: 100% (11/11) done remote: Total 11 (delta 8), reused 1 (delta 1) Unpacking 11 objects error: failed to read delta-pack base object 4d4d30be967d3284cbf59afd4fba6ab536e295f5 fatal: unpack-objects died with error code 1 Fetch failure: /home/mst/scm/libmthca/ mst@mst-lt:~/tmp/libmthca_bad$ git prune mst@mst-lt:~/tmp/libmthca_bad$ git pull ~/scm/libmthca/ remote: Generating pack... remote: Done counting 18 objects. Result has 11 objects. Deltifying 11 objects. 10remote: 0% (11/11) done Total 11 (delta 8), reused 1 (delta 1) Unpacking 11 objects 100% (11/11) done Updating 732a507..322a6c9 Fast forward Makefile.am | 25 +++++++++++++++++-------- configure.in | 16 ++++++++++++++-- debian/changelog | 4 +--- mthca.driver | 1 + src/mthca.c | 23 ++++++++++++----------- 5 files changed, 45 insertions(+), 24 deletions(-) create mode 100644 mthca.driver So it seems the tree was more or less fine (it just has some useless objects because of the disk full failure), the bug seems to be that pull/push fail. I made a backup of the bad tree so that if someone wants to play with it, here it is: http://www.openfabrics.org/~mst/libmthca_bad.tgz -- MST - 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