Re: FW: Git pulls failing on ia64 test tree?

Junio C Hamano [off-list ref] writes:

As a workaround, please do this:

    cd /pub/scm/linux/kernel/git/aegl/linux-2.6.git/
    ln ../../torvalds/linux-2.6.git/objects/pack/* objects/pack/.
    mv objects/info/alternates objects/info/alternates+
    GIT_DIR=. git fetch ../../torvalds/linux-2.6.git/
    GIT_DIR=. git fsck-objects
    mv objects/info/alternates+ objects/info/alternates

Actually, please chuck the last step to re-enable alternates.
Otherwise everytime Linus updates his repository you will be out
of sync and will get hit by the same problem.

The 'git fetch' step would complain about a couple of commits
you have but there is no need to worry -- we are deliberately
"corrupting" your repository by temporarily moving alternates
away so that it can fetch missing objects from Linus repository.
The fsck-objects should then report no missing objects.

Sorry for this very unpleasant experience git has caused you
X-<.