Re: [PATCH 1/5] receive-pack.c: add protocol support to negotiate atomic-push
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 15, 2014, 20:53 UTC
- Message-ID
- <xmqqy4q8d493.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1418673368-20785-2-git-send-email-sbeller@google.com>
Stefan Beller <sbeller@google.com> writes:
Show 9 quoted lines
> From: Ronnie Sahlberg <sahlberg@google.com> > > This adds support to the protocol between send-pack and receive-pack to > * allow receive-pack to inform the client that it has atomic push capability > * allow send-pack to request atomic push back. > > There is currently no setting in send-pack to actually request that atomic > pushes are to be used yet. This only adds protocol capability not ability > for the user to activate it.
Hmph, am I reading the patch to send-pack.c correctly?
It detects if the other side supports the capability and leaves it in atomic_push_supported variable for later use, and also requests the feature to be activated when atomic_push is set, but I see no logic to link these two together, e.g. error out when atomic_push is true and atomic_push_supported is false (or turn it off with a warning, or whatever).
Show 30 quoted lines
> diff --git a/send-pack.c b/send-pack.c
> index 949cb61..1ccc84c 100644
> --- a/send-pack.c
> +++ b/send-pack.c
> @@ -294,6 +294,8 @@ int send_pack(struct send_pack_args *args,
> int use_sideband = 0;
> int quiet_supported = 0;
> int agent_supported = 0;
> + int atomic_push_supported = 0;
> + int atomic_push = 0;
> unsigned cmds_sent = 0;
> int ret;
> struct async demux;
> @@ -314,6 +316,8 @@ int send_pack(struct send_pack_args *args,
> agent_supported = 1;
> if (server_supports("no-thin"))
> args->use_thin_pack = 0;
> + if (server_supports("atomic-push"))
> + atomic_push_supported = 1;
> if (args->push_cert) {
> int len;
>
> @@ -335,6 +339,8 @@ int send_pack(struct send_pack_args *args,
> strbuf_addstr(&cap_buf, " side-band-64k");
> if (quiet_supported && (args->quiet || !args->progress))
> strbuf_addstr(&cap_buf, " quiet");
> + if (atomic_push)
> + strbuf_addstr(&cap_buf, " atomic-push");
> if (agent_supported)
> strbuf_addf(&cap_buf, " agent=%s", git_user_agent_sanitized());