From: Junio C Hamano <junkio@cox.net>
To: "Luck, Tony" <tony.luck@intel.com>
Cc: git@vger.kernel.org
Subject: Re: FW: Git pulls failing on ia64 test tree?
Date: Wed, 14 Sep 2005 10:47:35 -0700 [thread overview]
Message-ID: <7vfys7lex4.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vk6hjlfxw.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Wed, 14 Sep 2005 10:25:31 -0700")
Junio C Hamano <junkio@cox.net> 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-<.
prev parent reply other threads:[~2005-09-14 17:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-14 15:47 FW: Git pulls failing on ia64 test tree? Luck, Tony
2005-09-14 16:39 ` Junio C Hamano
2005-09-14 17:25 ` Junio C Hamano
2005-09-14 17:47 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vfys7lex4.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).