Re: [PATCH v3 05/10] upload-pack, receive-pack: introduce protocol version 1

From: Brandon Williams <bmwill@google.com>
Date: Oct 13, 2017, 22:18 UTC
Message-ID: <20171013221846.GB101395@google.com>
In-Reply-To: <20171010112818.bd75e8dbe4ae39c90e6512da@google.com>

On 10/10, Jonathan Tan wrote:

Show 26 quoted lines

> On Tue,  3 Oct 2017 13:15:02 -0700
> Brandon Williams <bmwill@google.com> wrote:
> 
> > +	switch (determine_protocol_version_server()) {
> > +	case protocol_v1:
> > +		if (advertise_refs || !stateless_rpc)
> > +			packet_write_fmt(1, "version 1\n");
> > +		/*
> > +		 * v1 is just the original protocol with a version string,
> > +		 * so just fall through after writing the version string.
> > +		 */
> 
> Peff sent out at least one patch [1] that reformats fallthrough comments
> to be understood by GCC. It's probably worth doing here too.
> 
> In this case, I would do the 2-comment system that Peff suggested:
> 
> 	/*
> 	 * v1 is just the original protocol with a version string,
> 	 * so just fall through after writing the version string.
> 	 */
> 	if (advertise_refs || !stateless_rpc)
> 		packet_write_fmt(1, "version 1\n");
> 	/* fallthrough */
> 
> (I put the first comment before the code, so it doesn't look so weird.)

Sounds good.

Show 6 quoted lines

> 
> [1] https://public-inbox.org/git/20170921062541.ew67gyvrmb2ot4sf@sigill.intra.peff.net/
> 
> > +	case protocol_v0:
> > +		break;
> > +	default:

I'm also going to change this to from default to 'protocol_unknown_version' that way we get a compiler error instead of a run-time BUG when introducing a new protocol version number.

> > +		BUG("unknown protocol version");
> > +	}

-- 
Brandon Williams