From patchwork Thu Jun 4 17:54:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Couder X-Patchwork-Id: 11588209 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 94B2090 for ; Thu, 4 Jun 2020 17:55:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7915920738 for ; Thu, 4 Jun 2020 17:55:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="StL6nQR1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730344AbgFDRz0 (ORCPT ); Thu, 4 Jun 2020 13:55:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730336AbgFDRzX (ORCPT ); Thu, 4 Jun 2020 13:55:23 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0C4CC08C5C0 for ; Thu, 4 Jun 2020 10:55:22 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id c3so7073804wru.12 for ; Thu, 04 Jun 2020 10:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3UbWBbqthOteAeFgEeN1OMziwAp2xGWU0IRuQXIy9Io=; b=StL6nQR1pd/tkHq/IM6sFg5WbC44j/uTrnmRRGDR5HOjyDTPllbmtTHTXHUeafK/8a Fat9hoFxTnm1UYrfeFC+ZhSAdzlDqKScxPcO8pMsthABd+xfvoKGYRNwYhV+uZK1VVfK Wd4HsqNQ9ATO9G9X//4a4lW4bkCLbdEIgY/fhIupSlVbyw7lAWo/bzyVJcsrWy0yYflU mHOShxJIMe/IiclIEjGBt6IO1Lr1J40hYhLVhNT2duyYilYaG2IB5pre/RltLsQ0dHEQ uBhAkVwi6YahbuH6/AZFb5pqcocO7Kq46KSuBxCY7vYPlGcXA+G+LUHPaEd2bRsnP5Yk Vawg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3UbWBbqthOteAeFgEeN1OMziwAp2xGWU0IRuQXIy9Io=; b=R/FZpsySpxTvn2cdYNOrdPvFUoUwmJcbs3itzeBbgJeIH5KNOt/RBwgn2mrvxWG6mn kLJ1pUTpYNtlfwbHObwh5wfdaBwyStnYt7s1u1b+Fy4GGQZp1pdCDIVBDXMbRAYvFmjP rQXoWnoVejUnzfVMbNAgopqdnMRl9bGrjnZlJPw1oweNS3SDPFhcQRMbyoTVj58ztHBQ 3WP9vr8goRTcLkF8bGN63xkgtyI+Tywwrp9dQcgCMjEXvLvFxKbU3NG6LqHSoX0BmRCD /cgxIQes21vb4Ec018sk7M6D2PiLnFQNKS0/DiZicddEfNRZQqhFtkArb71y7xWogN37 waIg== X-Gm-Message-State: AOAM531FtTp2IgM8kmiAKDJzPYHd7JypjWwiIHFCV4fjf7iDKrQfBzWR KQOIhvr2v5lIDuVh1rLN1NHPs2bu1Qw= X-Google-Smtp-Source: ABdhPJxZp4fOIdPaGiahKPZZ34LQqDNXzf+Sn74VRq3UfXvlyvwkAJhyv+A/qmgrh+N7slSpv7yjBQ== X-Received: by 2002:a5d:60c3:: with SMTP id x3mr5336289wrt.48.1591293321307; Thu, 04 Jun 2020 10:55:21 -0700 (PDT) Received: from localhost.localdomain ([185.228.231.251]) by smtp.gmail.com with ESMTPSA id s7sm9173540wrr.60.2020.06.04.10.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2020 10:55:20 -0700 (PDT) From: Christian Couder X-Google-Original-From: Christian Couder To: git@vger.kernel.org Cc: Junio C Hamano , Derrick Stolee , Jeff King , Taylor Blau , Jonathan Tan , Jonathan Nieder , Christian Couder , Christian Couder Subject: [PATCH v3 11/13] upload-pack: move allow_ref_in_want to upload_pack_data Date: Thu, 4 Jun 2020 19:54:48 +0200 Message-Id: <20200604175450.17385-12-chriscool@tuxfamily.org> X-Mailer: git-send-email 2.27.0.rc0.26.gf2851482f5 In-Reply-To: <20200604175450.17385-1-chriscool@tuxfamily.org> References: <20200602041657.7132-1-chriscool@tuxfamily.org> <20200604175450.17385-1-chriscool@tuxfamily.org> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Christian Couder As we cleanup 'upload-pack.c' by using 'struct upload_pack_data' more thoroughly, let's move the 'allow_ref_in_want' static variable into this struct. It is used only by protocol v2 code. Signed-off-by: Christian Couder Acked-by: Jeff King Signed-off-by: Junio C Hamano --- upload-pack.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index 19b342d4b0..0d75745d8d 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -55,8 +55,6 @@ static int shallow_nr; static struct object_array extra_edge_obj; static const char *pack_objects_hook; -static int allow_ref_in_want; - static int allow_sideband_all; /* @@ -104,6 +102,7 @@ struct upload_pack_data { unsigned allow_filter : 1; unsigned done : 1; /* v2 only */ + unsigned allow_ref_in_want : 1; /* v2 only */ }; static void upload_pack_data_init(struct upload_pack_data *data) @@ -1145,7 +1144,7 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data) } else if (!strcmp("uploadpack.allowfilter", var)) { data->allow_filter = git_config_bool(var, value); } else if (!strcmp("uploadpack.allowrefinwant", var)) { - allow_ref_in_want = git_config_bool(var, value); + data->allow_ref_in_want = git_config_bool(var, value); } else if (!strcmp("uploadpack.allowsidebandall", var)) { allow_sideband_all = git_config_bool(var, value); } else if (!strcmp("core.precomposeunicode", var)) { @@ -1289,7 +1288,7 @@ static void process_args(struct packet_reader *request, /* process want */ if (parse_want(&data->writer, arg, &data->want_obj)) continue; - if (allow_ref_in_want && + if (data->allow_ref_in_want && parse_want_ref(&data->writer, arg, &data->wanted_refs, &data->want_obj)) continue;