Re: git merging

[Jens Axboe <axboe@suse.de>]

On Mon, Jun 20 2005, Linus Torvalds wrote:
> 
> [ Daniel put on the To: list to see if he can confirm or deny my theory ]
> 
> On Mon, 20 Jun 2005, Jens Axboe wrote:
> > 
> > axboe@nelson:[.]l/git/linux-2.6-block.git $ git prune
> > error: cannot map sha1 file c39ae07f393806ccf406ef966e9a15afc43cc36a
> 
> That's the 2.6.11 "tree" object.
> 
> > bad sha1 entry '5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c'
> > axboe@nelson:[.]l/git/linux-2.6-block.git $ git-fsck-cache 
> > error: cannot map sha1 file c39ae07f393806ccf406ef966e9a15afc43cc36a
> > bad object in tag 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c
> > bad sha1 entry '5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c'
> > 
> > Running git prune again gives me the same output. What is wrong?
> 
> Very interesting. You have my "v2.6.11-tree" tag file pointing the 2.6.11
> tree object, but you seem to not have that 2.6.11 tree itself.
> 
> Actually, judging from the fact that you got this error _during_ the
> prune, maybe you never had it in that repository in the first place?

I can't tell exactly, but I'm fairly sure this is a new error. I have
two git trees locally - one which is just an rsync of your kernel.org
tree, the other which is based off that (with a clone of the fs dir) and
has multiple branches for developments. The main tree did not have this
problem, while the development tree does/did.

> In particular, if you don't use "rsync", but instead use one of the
> "optimized pull" things to create a repository (ie git-http-pull or
> git-ssh-pull), I think your newly pulled tree will always miss anything
> that isn't a head. And the 2.6.11 tree is a special case: it's a pure
> "tree" object without any commit at all pointing to it, just a single tag
> that points directly to the tree.
> 
> Anyway, the fact that you're missing the original 2.6.11 tree doesn't
> really matter, so it's not a huge deal per se. You can re-populate it with
> an "rsync -avz --ignore-existing", but clearly something seems to be
> wrong.

I pulled with rsync manually from kernel.org, and that did fix things up
for me. The main tree is rsync'ed, but the development tree gets the
changes with /opt/kernel/git/linux-2.6/.git/ as the url given to
git-pull-script.

-- 
Jens Axboe