Re: [PATCH 4/4] Doc: push with --base

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 9, 2020, 21:20 UTC
Message-ID: <xmqq8sbab52p.fsf@gitster.c.googlers.com>
In-Reply-To: <20201109195630.2511149-1-jonathantanmy@google.com>

Jonathan Tan <jonathantanmy@google.com> writes:

Show 9 quoted lines

>> People expect that a single repository at their hosting sites can be
>> used as the central meeting point for the project, just like CVS/SVN
>> servers were in older world.  "git push" would need to accept that
>> reality and start common ancestor discovery eventually.
>
> Thanks for your reply (and everyone else's). I was thinking that a more
> rudimentary form of the feature would suffice, since I wasn't expecting
> much more need in the future, but looks like this isn't the case. I'll
> be thinking of a more comprehensive idea.

I said "eventually", meaning that we may not have to solve it immediately, but judging from the need for ad-hoc workarounds like sending older commits that are not necessarily at the tip of anything from the receiving end as if they are tips and then another ad-hoc workaround like this one, it seems that the need is real.

Would the earlier refactoring of the negotiation part into a separate negotiator module help, or did the refactor not remove the deep assumption that it is only about the fetch/upload-pack traffic and we need a design for push/receive-pack from scratch?

Thanks.