From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75B19C433DF for ; Wed, 27 May 2020 18:46:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6893E207E8 for ; Wed, 27 May 2020 18:46:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726222AbgE0Sqj (ORCPT ); Wed, 27 May 2020 14:46:39 -0400 Received: from cloud.peff.net ([104.130.231.41]:57936 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726095AbgE0Sqi (ORCPT ); Wed, 27 May 2020 14:46:38 -0400 Received: (qmail 23466 invoked by uid 109); 27 May 2020 18:39:58 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with ESMTP; Wed, 27 May 2020 18:39:58 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 6455 invoked by uid 111); 27 May 2020 18:39:56 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Wed, 27 May 2020 14:39:56 -0400 Authentication-Results: peff.net; auth=none Date: Wed, 27 May 2020 14:39:56 -0400 From: Jeff King To: Christian Couder Cc: git@vger.kernel.org, Junio C Hamano , Derrick Stolee , Taylor Blau , Jonathan Tan , Jonathan Nieder , Christian Couder Subject: Re: [PATCH 09/12] upload-pack: move allow_filter to upload_pack_data Message-ID: <20200527183956.GG4020820@coredump.intra.peff.net> References: <20200515100454.14486-1-chriscool@tuxfamily.org> <20200527164742.23067-1-chriscool@tuxfamily.org> <20200527164742.23067-10-chriscool@tuxfamily.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200527164742.23067-10-chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, May 27, 2020 at 06:47:39PM +0200, Christian Couder wrote: > As we cleanup 'upload-pack.c' by using 'struct upload_pack_data' > more thoroughly, let's move the 'allow_filter' static variable > into this struct. > > It is only used by protocol v0 code since protocol v2 assumes > certain baseline capabilities, but rolling it into > upload_pack_data and just letting v2 code ignore it as it does > now is more coherent and cleaner. I'm not sure that's true. It should be reflecting the uploadpack.allowfilter config in both cases. This final hunk: > @@ -1329,7 +1331,7 @@ static void process_args(struct packet_reader *request, > continue; > } > > - if (allow_filter && skip_prefix(arg, "filter ", &p)) { > + if (data->allow_filter && skip_prefix(arg, "filter ", &p)) { > list_objects_filter_die_if_populated(&data->filter_options); > parse_list_objects_filter(&data->filter_options, p); > continue; is v2 respecting it. -Peff