From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: [PATCH v6 12/23] send-pack: clarify that cmds_sent is a boolean Date: Wed, 17 Sep 2014 15:45:47 -0700 Message-ID: <1410993958-32394-13-git-send-email-gitster@pobox.com> References: <1410993958-32394-1-git-send-email-gitster@pobox.com> To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Sep 18 00:46:38 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 1XUNzh-0002BS-LG for gcvg-git-2@plane.gmane.org; Thu, 18 Sep 2014 00:46:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932107AbaIQWqd (ORCPT ); Wed, 17 Sep 2014 18:46:33 -0400 Received: from smtp.pobox.com ([208.72.237.35]:60703 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932071AbaIQWqb (ORCPT ); Wed, 17 Sep 2014 18:46:31 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp0.pobox.com (Postfix) with ESMTP id D2FCC39E15; Wed, 17 Sep 2014 18:46:30 -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=8IJ/ 2CsALDHCMaluPvlG+XtgAgY=; b=mjOPRDg8XX75D1LgOZAiucgtaUhWPdxaOoFt ADlJ0Fcmn7ZLg1zhiDBsaPEs+5Hk7xRPSO3cRiHaUkWjguBTFH1x58XXHNPaMMFq Xah+oYJiWFjcWqT4v0+SSmuZc4UXeURDwqL97lYx/kM3PTXQqYzp0k3nZbckWg4Y zd979NM= 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=eMvKtX NNkFhsb9vKKI0kBBo6CHVlkocGIejwClTba/QrLP8osAI5KIX6wvWK5W6wWu0Q0b c4HqINd3Rp/oAnqXnUAx4pYtMUJezHY8UsgdJrmbrPWawmtoNKgdXV1lVbH6c+kW kfDJc93JCqFhfFqWzpH0cejK9OsLe+3hluPlQ= Received: from pb-smtp0. (unknown [127.0.0.1]) by pb-smtp0.pobox.com (Postfix) with ESMTP id 5E65D39E13; Wed, 17 Sep 2014 18:46:30 -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 0F3BF39E0B; Wed, 17 Sep 2014 18:46:24 -0400 (EDT) X-Mailer: git-send-email 2.1.0-403-g099cf47 In-Reply-To: <1410993958-32394-1-git-send-email-gitster@pobox.com> X-Pobox-Relay-ID: 741BA710-3EBC-11E4-9E6B-BD2DC4D60FE0-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 use it to make sure that the feature request is sent only once on the very first request packet (ignoring the "shallow " line, which was an unfortunate mistake we cannot retroactively fix with existing receive-pack already deployed in the field) and we set it to "true" with cmds_sent++, not because we care about the actual number of updates sent but because it is merely an idiomatic way. Set it explicitly to one to clarify that the code that uses this variable only cares about its zero-ness. Signed-off-by: Junio C Hamano --- Unchanged since v5. send-pack.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/send-pack.c b/send-pack.c index 6dc8a46..bb13599 100644 --- a/send-pack.c +++ b/send-pack.c @@ -304,15 +304,16 @@ int send_pack(struct send_pack_args *args, old_hex = sha1_to_hex(ref->old_sha1); new_hex = sha1_to_hex(ref->new_sha1); - if (!cmds_sent) + if (!cmds_sent) { packet_buf_write(&req_buf, "%s %s %s%c%s", old_hex, new_hex, ref->name, 0, cap_buf.buf); - else + cmds_sent = 1; + } else { packet_buf_write(&req_buf, "%s %s %s", old_hex, new_hex, ref->name); - cmds_sent++; + } } if (args->stateless_rpc) { -- 2.1.0-403-g099cf47