From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_SPAM,RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 94C65201A7 for ; Sat, 20 May 2017 21:44:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932376AbdETVoI (ORCPT ); Sat, 20 May 2017 17:44:08 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:35562 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755033AbdETVoC (ORCPT ); Sat, 20 May 2017 17:44:02 -0400 Received: by mail-wr0-f193.google.com with SMTP id g12so5761454wrg.2 for ; Sat, 20 May 2017 14:44:01 -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=YQWnLKNWhyTp7Nc77ZC/TbdN/LUk9101kJEBIodtHTg=; b=hi5AfN50dw/U0PF1kPykrKBwPMdOZlbsTBWoFwS8iMlU42e7LHYmpnESTEzvlGIwYo D81CIiXa0grQXRnr6NndRED8sCpKuNlQjd3PBiyWr+jVQQ/0jSoJP7XIhpCsZTRWeJ0A 1ygOSolDiZVtimveB6SmCG+TEH7Vffy76jzyM7i1ML9a8AZa34ad+etqeBgM0MeUd1mb vH3z1zbLFwn5uTJwiSC2JwP6yedjLmf4mKwL9tdepM0oqE1zrn9tlqDVuNkWGjtnFYaP 1xVbhP+iDj4C9oxoPXfxaoHnia4ZgQRxL9qtevw6Y5lN6UEfJxHvJstMjA9gFrBzVrvq ESGQ== 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=YQWnLKNWhyTp7Nc77ZC/TbdN/LUk9101kJEBIodtHTg=; b=bkl2lpX0ThHj921KF+Sf3lPu+pob5E8wVxAg575mczUFvR2r9Te94kwtdKpIoSpufz x3ez/kW6xDhmKG1SXhNC369f2da2jcP2GSS6e6xWBQe091ojz2lj1ZIS82b+DW5K+zyX 3KN5QHTwUlr1u1Q0SZyf8M8anFS7pfKr5Muyo/pAhVTE9nepIV3owlaeN97NE/MOzD0Q ZomB82yXSfZdISOwb86hO2ZT01AHz+Wi1GBzyZbUEwZH1bNjxcDa6zMPF3XYp9sM0Os1 Kv/sD3hs6l3sTUexL+Ww21hMceOCEkvwKIGW50p2VjtYA0iRXN6x/orBreCJlyqZdlAJ 9ENg== X-Gm-Message-State: AODbwcBjPvlMaDRTJIvNk7zY8kPtI9KLf00pPxN8zHT47Qxl3uxyYTpw 8hj+tR9FP99wwQ== X-Received: by 10.223.165.5 with SMTP id i5mr7849781wrb.197.1495316641065; Sat, 20 May 2017 14:44:01 -0700 (PDT) Received: from u.nix.is ([2a01:4f8:190:5095::2]) by smtp.gmail.com with ESMTPSA id e73sm25666835wmd.1.2017.05.20.14.43.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 May 2017 14:44:00 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , Jeffrey Walton , =?UTF-8?q?Micha=C5=82=20Kiedrowicz?= , J Smith , Victor Leschuk , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Fredrik Kuivinen , Brandon Williams , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v3 28/30] pack-objects: fix buggy warning about threads Date: Sat, 20 May 2017 21:42:31 +0000 Message-Id: <20170520214233.7183-29-avarab@gmail.com> X-Mailer: git-send-email 2.13.0.303.g4ebf302169 In-Reply-To: <20170520214233.7183-1-avarab@gmail.com> References: <20170520214233.7183-1-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Fix a buggy warning about threads under NO_PTHREADS=YesPlease. Due to re-using the delta_search_threads variable for both the state of the "pack.threads" config & the --threads option, setting "pack.threads" but not supplying --threads would trigger the warning for both "pack.threads" & --threads. Solve this bug by resetting the delta_search_threads variable in git_pack_config(), it might then be set by --threads again and be subsequently warned about, as the test I'm changing here asserts. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/pack-objects.c | 4 +++- t/t5300-pack-object.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 9b4ba8a80d..efa21a15dd 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2472,8 +2472,10 @@ static int git_pack_config(const char *k, const char *v, void *cb) die("invalid number of threads specified (%d)", delta_search_threads); #ifdef NO_PTHREADS - if (delta_search_threads != 1) + if (delta_search_threads != 1) { warning("no threads support, ignoring %s", k); + delta_search_threads = 0; + } #endif return 0; } diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index 6ed23ee1d2..9c68b99251 100755 --- a/t/t5300-pack-object.sh +++ b/t/t5300-pack-object.sh @@ -447,7 +447,7 @@ test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack. git -c pack.threads=2 pack-objects --stdout --all /dev/null 2>err && grep ^warning: err >warnings && - test_must_fail test_line_count = 1 warnings && + test_line_count = 1 warnings && grep -F "no threads support, ignoring pack.threads" err && git -c pack.threads=2 pack-objects --threads=4 --stdout --all /dev/null 2>err && -- 2.13.0.303.g4ebf302169