Junio C Hamano <gitster@xxxxxxxxx> writes:
> PJ Hyett <pjhyett@xxxxxxxxx> writes:
> ...
>> The new alternates code in 1.6.1 sounds like that could be the issue.
>
> It could be.
>
> With the old server, when project A has a forked project A1, and A1
> borrows (via alternates) objects from A, pushing into A1 did not look at
> refs in A's repository (this all happens on the server end).
>
> With the new server, the server side also advertises the tips of A's
> branches as commits that are fully connected, when the client side tries
> to push into A1. Older clients ignored this advertisement, so when they
> pushed into A1, because their push did not depend on what's in repository
> A on the server end, did not get affected if repository A (not A1) is
> corrupted. A new client talking to the server would be affected because
> it believes what the server says.
>
> Older client ignores this advertisement, so if you are seeing trouble
> reports from people who use older clients, then you can dismiss this
> conjecture as unrelated. But if you see the issue only from people with
> new clients, this could be just exposing a repository corruption of A (not
> A1) on the server end that people did not know about before.
The extra "we also have these" advertisement happened as a result of this
discussion:
http://thread.gmane.org/gmane.comp.version-control.git/95072/focus=95256
I think I know what is going on.
Consider this sequence of events.
(0) Alice creates a project and pushes to public.
alice$ cd $HOME/existing-tarball-extract
alice$ git init
alice$ git add .
alice$ git push /pub/alice.git master
(1) Bob forks it.
bob$ git clone --bare --reference /pub/alice.git /pub/bob.git
(2) Bob clones his.
bob$ cd $HOME && git clone /pub/bob.git bob
(3) Alice works more and pushes
alice$ edit foo
alice$ git add foo
alice$ git commit -a -m 'more'
alice$ git push /pub/alice.git master
(4) Bob works more and tries to push to his.
bob$ cd $HOME/bob
bob$ edit bar
bob$ git add bar
bob$ git commit -a -m 'yet more'
bob$ git push /pub/bob.git master
Now, the new server advertises the objects reachable from alice's branch
tips as usable cut-off points for pack-objects bob will run when sending.
And new builtin-send-pack.c has new code that feeds "extra" refs as
^SHA1\n
to the pack-objects process.
The latest commit Alice created and pushed into her repository is one such
commit.
But the problem is that Bob does *NOT* have it. His "push" will run pack
object telling it that objects reachable from Alice's top commit do not
have to be sent, which was the whole point of doing this new "we also have
these" advertisement, but instead of ignoring that unknown commit,
pack-objects would say "Huh? I do not even know that commit" and dies.
This can and should be solved by client updates, as 1.6.1 server can work
with older client just fine.
--
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
