From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: [PATCH 17/18] send-pack: send feature request on push-cert packet Date: Tue, 19 Aug 2014 15:06:26 -0700 Message-ID: <1408485987-3590-18-git-send-email-gitster@pobox.com> References: <1408485987-3590-1-git-send-email-gitster@pobox.com> To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Aug 20 00:09:53 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XJrbB-0006ya-Pv for gcvg-git-2@plane.gmane.org; Wed, 20 Aug 2014 00:09:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752079AbaHSWJ0 (ORCPT ); Tue, 19 Aug 2014 18:09:26 -0400 Received: from smtp.pobox.com ([208.72.237.35]:58008 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751733AbaHSWJW (ORCPT ); Tue, 19 Aug 2014 18:09:22 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp0.pobox.com (Postfix) with ESMTP id 768CB3319F; Tue, 19 Aug 2014 18:09:22 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:in-reply-to:references; s=sasl; bh=kLWm 5+OyuRWVlYQtkmbzT4Tq9oc=; b=sNsHmLZNag6a9ubPYmNmn1gwzqFULOObAuBl RPNyg4yPmITFZxSKhE000nanojGENvSdYRdLYaTL4n2MVH+gwYeEmCkgq9m4qOUi 3YI8RnVDBK5PtWj4p2gCjKUofxZfnQlXfhQGPCURRZkC5av6BncLe7Vx7+M0jsnX WVmZEoU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:subject :date:message-id:in-reply-to:references; q=dns; s=sasl; b=AUhWGV +uxImeqzCfB22Ov29+JTQ3RiZAqLZfu+Ld2slfuf3jGagzinyN1MH04YM4NGUSO8 0D/lsq/i8hv1zIxSAkskeWUxHtoWCV3khBAp4W4Y5Wdzs1SSKl37tXRWKj8SLVR8 OWNyV14LnLqBETt4oeRVr4X9k4blFTMKK0U3g= Received: from pb-smtp0.int.icgroup.com (unknown [127.0.0.1]) by pb-smtp0.pobox.com (Postfix) with ESMTP id 6CEC73319D; Tue, 19 Aug 2014 18:09:22 -0400 (EDT) Received: from pobox.com (unknown [72.14.226.9]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by pb-smtp0.pobox.com (Postfix) with ESMTPSA id 9F16033192; Tue, 19 Aug 2014 18:09:14 -0400 (EDT) X-Mailer: git-send-email 2.1.0-301-g54593e2 In-Reply-To: <1408485987-3590-1-git-send-email-gitster@pobox.com> X-Pobox-Relay-ID: 74B34CC2-27ED-11E4-B782-9903E9FBB39C-77302942!pb-smtp0.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: We would want to update the interim protocol so that we do not send the usual update commands when the push certificate feature is in use, as the same information is in the certificate. Once that happens, the push-cert packet may become the only protocol command, but then there is no packet to put the feature request behind, like we always did. As we have prepared the receiving end that understands the push-cert feature to accept the feature request on the first protocol packet (other than "shallow ", which was an unfortunate historical mistake that has to come before everything else), we can give the feature request on the push-cert packet instead of the first update protocol packet, in preparation for the next step to actually update to the final protocol. Signed-off-by: Junio C Hamano --- send-pack.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/send-pack.c b/send-pack.c index a073891..2de9826 100644 --- a/send-pack.c +++ b/send-pack.c @@ -225,9 +225,10 @@ static const char *next_line(const char *line, size_t len) return nl + 1; } -static void generate_push_cert(struct strbuf *req_buf, - const struct ref *remote_refs, - struct send_pack_args *args) +static int generate_push_cert(struct strbuf *req_buf, + const struct ref *remote_refs, + struct send_pack_args *args, + const char *cap_string) { const struct ref *ref; char stamp[60]; @@ -256,7 +257,7 @@ static void generate_push_cert(struct strbuf *req_buf, if (sign_buffer(&cert, &cert, signing_key)) die(_("failed to sign the push certificate")); - packet_buf_write(req_buf, "push-cert\n"); + packet_buf_write(req_buf, "push-cert%c%s", 0, cap_string); for (cp = cert.buf; cp < cert.buf + cert.len; cp = np) { np = next_line(cp, cert.buf + cert.len - cp); packet_buf_write(req_buf, @@ -267,6 +268,7 @@ static void generate_push_cert(struct strbuf *req_buf, free_return: free(signing_key); strbuf_release(&cert); + return 1; } int send_pack(struct send_pack_args *args, @@ -337,7 +339,8 @@ int send_pack(struct send_pack_args *args, advertise_shallow_grafts_buf(&req_buf); if (!args->dry_run && args->push_cert) - generate_push_cert(&req_buf, remote_refs, args); + cmds_sent = generate_push_cert(&req_buf, remote_refs, args, + cap_buf.buf); /* * Clear the status for each ref and see if we need to send -- 2.1.0-301-g54593e2