From: Junio C Hamano <gitster@pobox.com>
To: Son Luong Ngoc <sluongng@gmail.com>
Cc: git@vger.kernel.org, jonathantanmy@google.com, peff@peff.net
Subject: Re: [DRAFT] What's cooking in git.git
Date: Tue, 28 Apr 2020 10:07:44 -0700 [thread overview]
Message-ID: <xmqqblnb4jz3.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAL3xRKdrATjL0+xUH9p8XtgXKd7tD+wCW-+TASJ8saVxBnJVZQ@mail.gmail.com> (Son Luong Ngoc's message of "Tue, 28 Apr 2020 07:10:25 +0200")
Son Luong Ngoc <sluongng@gmail.com> writes:
>> * jt/v2-fetch-nego-fix (2020-04-27) 3 commits
>> - fetch-pack: in protocol v2, reset in_vain upon ACK
>> - fetch-pack: in protocol v2, in_vain only after ACK
>> - fetch-pack: return enum from process_acks()
>
> Would it be ok to just proceed with the fix and skip the revert?
> Or do we intend to revert 'jn/demote-proto2-from-default' after the
> fix has landed into 'master'?
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.
That way, those who want to help us polish the code further for the
next release would use v2 as default with the proposed fix for this
breakage and can hunt for other breakages in v2, while those on the
maintenance track (and v2.26.3 JNeider wants to see happen soon)
would revert to the original protocol as default.
next prev parent reply other threads:[~2020-04-28 17:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 5:10 [DRAFT] What's cooking in git.git Son Luong Ngoc
2020-04-28 17:07 ` Junio C Hamano [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-28 1:17 Junio C Hamano
2020-04-28 3:36 ` Jeff King
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=xmqqblnb4jz3.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
--cc=sluongng@gmail.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).