Subject: Re: [PATCH v4 0/1] Advertise multiple supported proto versions

From: Josh Steadmon <[email-masked]>
Date: Wed, 14 Nov 2018 11:51:42 -0800

On 2018.11.14 19:22, Junio C Hamano wrote:
> Josh Steadmon <[email-masked]> writes:
> 
> > Fix several bugs identified in v3, clarify commit message, and clean up
> > extern keyword in protocol.h.
> 
> It is good to descirbe the change relative to v3 here, which would
> help those who are interested and reviewed v3.
> 
> To help those who missed the boat and v4 is their first encounter
> with this series, having the description relative to v3 alone and
> nothing else is not very friendly, though.

Ack. Will keep this in mind for future patches.

> >     + diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
> >     + --- a/builtin/upload-archive.c
> >     + +++ b/builtin/upload-archive.c
> >     +@@
> >     + #include "builtin.h"
> >     + #include "archive.h"
> >     + #include "pkt-line.h"
> >     ++#include "protocol.h"
> >     + #include "sideband.h"
> >     + #include "run-command.h"
> >     + #include "argv-array.h"
> >     +@@
> >     + 	if (argc == 2 && !strcmp(argv[1], "-h"))
> >     + 		usage(upload_archive_usage);
> >     + 
> >     ++	register_allowed_protocol_version(protocol_v0);
> >     ++
> >     + 	/*
> >     + 	 * Set up sideband subprocess.
> >     + 	 *
> 
> This one unfortunately seems to interact rather badly with your
> js/remote-archive-v2 topic which is already in 'next', when this
> topic is merged to 'pu', and my attempt to mechanically resolve
> conflicts breaks t5000.

Hmm, should we drop js/remote-archive-v2 then? Any solution that
unblocks js/remote-archive-v2 will almost certainly depend on this
patch.