From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: [PATCH v2 07/19] send-pack: always send capabilities Date: Fri, 22 Aug 2014 13:30:12 -0700 Message-ID: <1408739424-31429-8-git-send-email-gitster@pobox.com> References: <1408739424-31429-1-git-send-email-gitster@pobox.com> To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Aug 22 22:31:58 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 1XKvV4-0007mA-2U for gcvg-git-2@plane.gmane.org; Fri, 22 Aug 2014 22:31:54 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751533AbaHVUbu (ORCPT ); Fri, 22 Aug 2014 16:31:50 -0400 Received: from smtp.pobox.com ([208.72.237.35]:54315 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750978AbaHVUbt (ORCPT ); Fri, 22 Aug 2014 16:31:49 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp0.pobox.com (Postfix) with ESMTP id 88CD533194; Fri, 22 Aug 2014 16:31:49 -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=bRWB rpH34tejkC9o6IIgn1I7Pn4=; b=Is4I66YRSDpY9UOy5Q5LFzRTRnhIGZLRNxB3 4qu/gW94s12YysDKKRVkyx8Ioe3tJfwuWsTVNA5uLoUz1EEbzuQE9Y4MorZJAIVA eXsbHk/tQnqmMTc3t4CVsDEHUZ1rjI7VXm8k1YFTn2MlD4nU1q33HvZYIXeMmzRU nAc/MDg= 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=ThVqnE 8hC3E+1qgEB/0dfSG3ElR9gVR4P8TUJPaRDw8TUaD8rLaP1n+MGFHUypEXgY7emB EuMeW4c2ouKf6R7UabpNmvNWZyxs+rB829NO1W+6oz4nX7LOSwB+p7BANFZwTn+A 2xeRRbskjHguQF7rJc16Oq2ecsWIXafgya4MU= Received: from pb-smtp0.int.icgroup.com (unknown [127.0.0.1]) by pb-smtp0.pobox.com (Postfix) with ESMTP id 7F81933192; Fri, 22 Aug 2014 16:31:49 -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 DB6C533189; Fri, 22 Aug 2014 16:31:41 -0400 (EDT) X-Mailer: git-send-email 2.1.0-304-g950f846 In-Reply-To: <1408739424-31429-1-git-send-email-gitster@pobox.com> X-Pobox-Relay-ID: 536D6642-2A3B-11E4-B930-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 tried to avoid sending one extra byte, NUL and nothing behind it to signal there is no protocol capabilities being sent, on the first command packet on the wire, but it just made the code look ugly. Signed-off-by: Junio C Hamano --- send-pack.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/send-pack.c b/send-pack.c index f3c5ebe..2fa6c34 100644 --- a/send-pack.c +++ b/send-pack.c @@ -281,8 +281,7 @@ int send_pack(struct send_pack_args *args, char *new_hex = sha1_to_hex(ref->new_sha1); int quiet = quiet_supported && (args->quiet || !args->progress); - if (!cmds_sent && (status_report || use_sideband || - quiet || agent_supported)) { + if (!cmds_sent) packet_buf_write(&req_buf, "%s %s %s%c%s%s%s%s%s", old_hex, new_hex, ref->name, 0, @@ -292,7 +291,6 @@ int send_pack(struct send_pack_args *args, agent_supported ? " agent=" : "", agent_supported ? git_user_agent_sanitized() : "" ); - } else packet_buf_write(&req_buf, "%s %s %s", old_hex, new_hex, ref->name); -- 2.1.0-304-g950f846