From: Jonathan Nieder <jrnieder@gmail•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org, "Elijah Newren" <newren@gmail•com>,
"Jeff King" <peff@peff•net>,
"Carlo Marcelo Arenas Belón" <carenas@gmail•com>,
"Michal Suchánek" <msuchanek@suse•de>
Subject: Re: proto v2 fixes for maint (was Re: Preparing for a Git 2.26.3 release)
Date: Tue, 28 Apr 2020 22:56:59 -0700 [thread overview]
Message-ID: <20200429055659.GC42649@google.com> (raw)
In-Reply-To: <xmqq7dxz4j62.fsf@gitster.c.googlers.com>
Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail•com> writes:
>> The protocol version change was painful for users that fetch in the
>> same repo from linux-next and other linux remotes[5]. The problem has
>> been isolated and fixed, so we could either apply the revert or apply
>> the fixes[6].
>
> The demote patch hasn't even hit 'master'.
>
> My preference is to merge the demotion down to 'master' and 'maint'
> while merging down this fix to 'next' and to 'master'.
>
> And immediately revert the demotion on 'master', which will make the
> tip of 'master' with v2 as the default, with "this" fix.
Yes, sounds good to me.
By the way, the diagnosis in the demotion patch
Users fetching from linux-next and other kernel remotes are reporting
that the limited ref advertisement causes negotiation to reach
MAX_IN_VAIN, resulting in too-large fetches.
turned out to be false, as Peff noticed. It wasn't due to the ref
advertisement but was due to the protocol v2 code's reimplementation
of negotiation. It's probably not worth amending the commit message,
given that it's already in "next"; we can correct the record in the
revert for 'master', which I should probably write during the day when
I am less likely to make more errors.
Michal Suchánek wrote:
> Why not merge the fixes for v2,
> though? Even if it is not the default keeping it broken in maint does
> not sound great.
Yes, I like the "demote and fix" approach you're recommending.
Thanks,
Jonathan
next prev parent reply other threads:[~2020-04-29 5:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 5:55 Preparing for a Git 2.26.3 release Jonathan Nieder
2020-04-28 6:22 ` Elijah Newren
2020-04-28 17:25 ` proto v2 fixes for maint (was Re: Preparing for a Git 2.26.3 release) Junio C Hamano
2020-04-28 18:16 ` Michal Suchánek
2020-04-28 18:19 ` Junio C Hamano
2020-04-29 5:56 ` Jonathan Nieder [this message]
2020-05-08 22:26 ` Preparing for a Git 2.26.3 release Junio C Hamano
2020-05-09 7:07 ` Johannes Schindelin
2020-05-09 17:11 ` Junio C Hamano
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=20200429055659.GC42649@google.com \
--to=jrnieder@gmail$(echo .)com \
--cc=carenas@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=msuchanek@suse$(echo .)de \
--cc=newren@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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