git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Daniel Duvall <dan@mutual.io>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] upload-pack: allow stateless client EOF just prior to haves
Date: Fri, 30 Oct 2020 16:45:40 -0700	[thread overview]
Message-ID: <xmqqzh4346sb.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201030223504.45978-1-dan@mutual.io> (Daniel Duvall's message of "Fri, 30 Oct 2020 15:35:04 -0700")

>  t/t5705-upload-pack-stateless-shallow-eof.sh | 24 ++++++++++++++++++++
>  upload-pack.c                                | 13 ++++++++++-
>  2 files changed, 36 insertions(+), 1 deletion(-)
>  create mode 100755 t/t5705-upload-pack-stateless-shallow-eof.sh

Yuck.  Adding a new test file, only to hold a single test?

I'd rather see it folded in an existing test, if it makes sense.

Of course if we do not have any test for upload-pack, that's a
different story, but I suspect we already do test the command in
existing scripts.

> diff --git a/upload-pack.c b/upload-pack.c
> index 3b858eb457..5dc8e1f844 100644
> --- a/upload-pack.c
> +++ b/upload-pack.c
> @@ -1344,7 +1344,18 @@ void upload_pack(struct upload_pack_options *options)
>  				   PACKET_READ_DIE_ON_ERR_PACKET);
>  
>  		receive_needs(&data, &reader);
> -		if (data.want_obj.nr) {
> +
> +		/*
> +		 * An EOF at this exact point in negotiation should be
> +		 * acceptable from stateless clients as they will consume the
> +		 * shallow list before doing subsequent rpc with haves/etc.
> +		 */
> +		if (data.stateless_rpc)
> +			reader.options |= PACKET_READ_GENTLE_ON_EOF;
> +
> +		if (data.want_obj.nr &&
> +		    packet_reader_peek(&reader) != PACKET_READ_EOF) {
> +			reader.options &= ~PACKET_READ_GENTLE_ON_EOF;
>  			get_common_commits(&data, &reader);
>  			create_pack_file(&data, NULL);
>  		}

Thanks.

  reply	other threads:[~2020-10-30 23:45 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-30  1:40 [PATCH] " Daniel Duvall
2020-10-30  2:59 ` Eric Sunshine
2020-10-30  3:31   ` Daniel Duvall
2020-10-30  3:43 ` Daniel Duvall
2020-10-30 18:42   ` Junio C Hamano
2020-10-30 22:38     ` Daniel Duvall
2020-10-30  4:40 ` Jeff King
2020-10-30  7:47   ` Daniel Duvall
2020-10-30  9:09     ` Jeff King
2020-11-03 21:10       ` Junio C Hamano
2020-11-04 13:33         ` Jeff King
2020-11-04 14:06           ` Daniel Duvall
2020-11-04 18:25             ` Junio C Hamano
2020-10-30 22:35 ` [PATCH v2] " Daniel Duvall
2020-10-30 23:45   ` Junio C Hamano [this message]
2020-10-31  2:42     ` Daniel Duvall
2020-10-31  4:17       ` Junio C Hamano
2020-10-31  2:39 ` [PATCH v3] " Daniel Duvall

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=xmqqzh4346sb.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=dan@mutual.io \
    --cc=git@vger.kernel.org \
    --subject='Re: [PATCH v2] upload-pack: allow stateless client EOF just prior to haves' \
    /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

Code repositories for project(s) associated with this 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).