From patchwork Wed Jan 16 22:42:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Tan X-Patchwork-Id: 10767053 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8978517FB for ; Wed, 16 Jan 2019 22:42:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B0C52F00C for ; Wed, 16 Jan 2019 22:42:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F7C72F788; Wed, 16 Jan 2019 22:42:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06E2B2F00C for ; Wed, 16 Jan 2019 22:42:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387516AbfAPWmm (ORCPT ); Wed, 16 Jan 2019 17:42:42 -0500 Received: from mail-pf1-f202.google.com ([209.85.210.202]:49095 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733220AbfAPWml (ORCPT ); Wed, 16 Jan 2019 17:42:41 -0500 Received: by mail-pf1-f202.google.com with SMTP id t2so5801586pfj.15 for ; Wed, 16 Jan 2019 14:42:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=c5eafgfC+uPgjJecVEUZDa4WPYVYyn2cMXyiBBc6yK4=; b=tReU6hq8/+emf1+fKTQGCAfZi/H7+0SXid1S1hoWBnhKtSTeIINMaje+kU1xvmdJJh 5GRytD8WV32ecBT9vlfxtsWvrYWG6lYNa1CNUdAVKWjNGc3TrFKYBzVQGO0eTydeASY7 +77qyFr3ONH039y8in0Jo44iwve+jSNqQ/lQo1J7sVUVOz5tL9cPVDI2DhoEXUgCuoQ6 bT0oZOoK78c5OKWT2YMnWkZu+5I59n3lgykm0xPa+NSBlUDfkPq5BmtTGYgToZL5CGXT l8t4exPTr0FF8+8VlKsI2YeD2bqLQQVhTIaenQkOnqI3wCE9oJ2CHZtQUBQQJon2p0av P/Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=c5eafgfC+uPgjJecVEUZDa4WPYVYyn2cMXyiBBc6yK4=; b=kGzeFtr0mjeB1g+0dMb7OdMFiT0LC71NTHPKexFwLu+JfGQY90BdKCTMjIn2Nu6C5W jdlUiuJ6QgwS87p7q5kSlCgWY5DLhtKymZyq7PDxVCgn/3t8mn1QrNoLhT5ZNoVif385 0ygtuG9Y/m8gE9RZrb7s+xkFVCVtd5valpUHrGMaenCZqkvO3Is83qaC28kmwg+ksQGi uM4TxRFSFU9AViW8uRyM9RcRj6Gw1fotmmVw8DztaxKOugLStXrIKXtafTg2SdkT7BT1 cppxhNeFU20GNZiKsPTQgco6ULRmiKRQqltwaStELCvGa3UjyRit+rCMMKWVAbc2n4Iw GSYA== X-Gm-Message-State: AJcUukdzOhl1Zz2ovBJL+CGhZQyOfcp+5CSkadpodzAQR/pqx3f44MZo cB+vzSX6p1KbXQN8teX1JUfkPoA9SRh/T+f7MzXXvHWhohIKiqN2ZKcUYpe9vd/iiI6Ur+CuNbF nSVqeKOvLBYQMSDXt0WMkd9LRBSU3x9hwaU5pkDDZzVFA+MxLC7KPGmE57hV6exVeyxYZfnE5+e Eg X-Google-Smtp-Source: ALg8bN4IEYbtn4fQFkNJ8IK63mgbXfcySFjSaRKufKmgLIt7Nibg8qNfWkFHarDTFHR1lft81sfusCys8Sy3yozxjD7a X-Received: by 2002:a17:902:14cb:: with SMTP id y11mr3463350plg.42.1547678560968; Wed, 16 Jan 2019 14:42:40 -0800 (PST) Date: Wed, 16 Jan 2019 14:42:15 -0800 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.19.0.271.gfe8321ec05.dirty Subject: [WIP 7/8] t5552: compensate for v2 filtering ref adv. From: Jonathan Tan To: git@vger.kernel.org Cc: Jonathan Tan , avarab@gmail.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Protocol v2 filters the ref advertisement, but protocol v0 does not. A test in t5552 uses the ref advertisement, so fix it to use protocol v0. Signed-off-by: Jonathan Tan --- t/t5552-skipping-fetch-negotiator.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/t/t5552-skipping-fetch-negotiator.sh b/t/t5552-skipping-fetch-negotiator.sh index 30857b84a8..8a14be51a1 100755 --- a/t/t5552-skipping-fetch-negotiator.sh +++ b/t/t5552-skipping-fetch-negotiator.sh @@ -127,7 +127,10 @@ test_expect_success 'use ref advertisement to filter out commits' ' # not need to send any ancestors of "c3", but we still need to send "c3" # itself. test_config -C client fetch.negotiationalgorithm skipping && - trace_fetch client origin to_fetch && + + # The ref advertisement itself is filtered when protocol v2 is used, so + # use v0. + GIT_TEST_PROTOCOL_VERSION= trace_fetch client origin to_fetch && have_sent c5 c4^ c2side && have_not_sent c4 c4^^ c4^^^ '