From: Junio C Hamano <gitster@pobox.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
git@vger.kernel.org, Derrick Stolee <dstolee@microsoft.com>
Subject: Re: Protocol v2 in v2.27 (Re: Re* [ANNOUNCE] Git v2.27.0-rc1)
Date: Thu, 21 May 2020 09:42:02 -0700 [thread overview]
Message-ID: <xmqqd06xtf39.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <1a3bf366-d888-74d3-5f81-78dfeb5eb79c@gmail.com> (Derrick Stolee's message of "Thu, 21 May 2020 07:54:08 -0400")
Derrick Stolee <stolee@gmail.com> writes:
>> Git 2.26 used protocol v2 as its default protocol, but soon after
>> release, users noticed that the protocol v2 negotiation code was prone
>> to fail when fetching from some remotes that are far ahead of others
>> (such as linux-next.git versus Linus's linux.git). That has been
>> fixed by 0b07eecf6ed (Merge branch 'jt/v2-fetch-nego-fix',
>> 2020-05-01),
>
> Should we really mention the merge here? Is it because the "fix" is
> spread across two commits? Why not say the tip of the topic?
Strictly speaking, the tip of the topic is sufficient. You can use
a third-party script "git when-merged" to ask "which exact merge
gave us this commit in the mainline?" when given only the tip of the
topic, which is what I often end up doing.
Writing the merge result reduces the need for doing the same
"reverse" look-up.
On the other hand, going the other way to find the then-current tip
of the topic from the result of the merge is much easier; you can
ask the merge result what its second parent is.
The rest of your review I can entirely agree with. Thanks, always,
for a prompt and well written review.
next prev parent reply other threads:[~2020-05-21 16:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 19:17 [ANNOUNCE] Git v2.27.0-rc1 Junio C Hamano
2020-05-20 19:31 ` Jeff King
2020-05-20 20:02 ` Junio C Hamano
2020-05-20 20:31 ` Re* " Junio C Hamano
2020-05-20 21:24 ` Jeff King
2020-05-20 22:00 ` Protocol v2 in v2.27 (Re: Re* [ANNOUNCE] Git v2.27.0-rc1) Jonathan Nieder
2020-05-20 23:59 ` Junio C Hamano
2020-05-21 0:29 ` Jeff King
2020-05-21 2:15 ` Jonathan Nieder
2020-05-21 2:35 ` Carlo Marcelo Arenas Belón
2020-05-21 2:45 ` connect: don't request v2 when pushing (Re: Protocol v2 in v2.27) Jonathan Nieder
2020-05-21 3:26 ` Carlo Marcelo Arenas Belón
2020-05-21 11:54 ` Protocol v2 in v2.27 (Re: Re* [ANNOUNCE] Git v2.27.0-rc1) Derrick Stolee
2020-05-21 16:42 ` Junio C Hamano [this message]
2020-05-21 16:34 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqd06xtf39.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=stolee@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).