Re: [DRAFT] What's cooking in git.git

Son Luong Ngoc· Apr 28, 2020, 05:10 UTC · lore

Hi,

On Mon, Apr 27, 2020 at 06:17:37PM -0700, Junio C Hamano wrote:

Show 9 quoted lines

> * jn/demote-proto2-from-default (2020-04-22) 1 commit
>   (merged to 'next' on 2020-04-22 at 1a5e0b221a)
>  + Revert "fetch: default to protocol version 2"
>
>  Those fetching over protocol v2 from linux-next and other kernel
>  repositories are reporting that v2 often fetches way too much than
>  needed.
>
>  Will merge to 'master'.

...

> * 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'?

Cheers, Son Luong.

Junio C Hamano· Apr 28, 2020, 17:07 UTC · re: Son Luong Ngoc · lore

Son Luong Ngoc <sluongng@gmail.com> writes:

Show 8 quoted lines

>> * 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.