15

When running get svn fetch to pull the latest new branches from the upstream svn repository I got this error:

$ git svn fetch
fatal: failed to unpack tree object 5ecb324e8b8fcb918acb253f33edc6ce49e49e0d
read-tree 5ecb324e8b8fcb918acb253f33edc6ce49e49e0d: command returned error: 128

Now every attempt at git svn on that local repo results in the same error. Originally I was running git version 1.5.6.4_0 and after the error I tried updating to 1.6.0.2_2 and the problem still persists.

Is there any way to clean up this corruption? A fresh git svn clone of the upstream repository is fine, but I'd like to preserve my existing setup. I've looked through the docs and googled for the problem with no luck.

Chris
  • 6,761
  • 6
  • 52
  • 67
notascleveras
  • 151
  • 1
  • 3

3 Answers3

5

I had the same problem. It is due to a particular SVN revision that git-svn can't read or deal with somehow. Here is what i tried in order:

  1. Rewind to a revision known to work: git svn reset -r 42
  2. Retry the fetch: git svn fetch — Fetches each revision starting from 42 until the guilty one (say 50), then shows the same error message.
  3. Fetch the parent: git svn fetch --parent — Don't ask me why. That fetches more revisions. No idea whether it's relevant though.
  4. Retry the fetch: git svn fetch — Still doesn't work.
  5. Fetch each of the next revisions:
    1. git svn fetch -r 50 — Works.
    2. git svn fetch -r 51 — While no error message, go on.
    3. git svn fetch -r xx — The error message shows up, it's the bad revision. Don't care.
    4. git svn fetch -r xx+1 — Works.
  6. Retry the fetch: git svn fetch — Works! Starts to fetch more revisions.

The process ought to be cleaned up (probably near the first steps), but it worked for me, without having to start again with a fresh clone.

David Ammouial
  • 300
  • 4
  • 13
  • It worked! But in my case I was able to fetch the "problematic" revision. I just reset to x-1 revision (x is the latest revision) and than fetched x revision, which worked and than "git svn fetch" just worked. Can anyone explain what it fixes? the git svn reset could just delete a corrupted local file? – TCS Aug 02 '16 at 14:48
4

I experienced the same error message after creating a new SVN branch. I was able to resolve the issue by deleting the complete ".git/svn" directory and fetching from SVN again:

$ rm -rf .git/svn
$ git svn fetch
Rebuilding .git/svn/refs/remotes/trunk/.rev_map.1d5df120-ff1b-4f4f-af56-171ecbcc785d ...

This fetched all commits from SVN again and resolved the error.

famousgarkin
  • 13,687
  • 5
  • 58
  • 74
amaechler
  • 845
  • 9
  • 18
4

The most likely cause for this is a file or commit (that the tree references) is corrupted or missing. Or the tree itself could be corrupted. Check with:

git fsck --unreachable HEAD $(cat .git/refs/heads/*)

This will show a bunch of "dangling" files, which you don't care about; corrupted files will report "Invalid SHA1" or some such thing. I don't know how a missing file would report. Remove any corrupt items and rsync from your upstream repo to replace them.

Paul
  • 16,255
  • 3
  • 33
  • 25
  • Thanks for the info. Unfortunately, no corrupt files showing up, just a handful of unreachable trees/commits/blobs. Using git as a front end to a svn repo I don't have an upstream git to rsync with for recovery. I tried rsync from the fresh git svn clone, but lost all my local branches. – notascleveras Dec 08 '08 at 17:50
  • There was a report in the newsgroup (or maybe the mailing list) 2 to 3 months ago of someone having a similar problem which went away when they repacked their repo. I haven't been able to find the report, which probably means it wasn't exactly the same error messages. – Paul Dec 09 '08 at 07:22
  • I just tried repacking. No luck. For now I'm moving on to the fresh git svn clone. Thanks for the suggestions. – notascleveras Dec 11 '08 at 23:30