From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 8EDA41F466 for ; Tue, 28 Jan 2020 18:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726967AbgA1S0y (ORCPT ); Tue, 28 Jan 2020 13:26:54 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41805 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726885AbgA1S0v (ORCPT ); Tue, 28 Jan 2020 13:26:51 -0500 Received: by mail-wr1-f68.google.com with SMTP id c9so17219760wrw.8 for ; Tue, 28 Jan 2020 10:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=pp+putYic/YPhOPXhgtuPLfFxxGHo2lzSEwyNyMGA0M=; b=ftnYDszcnRlJJ+eYW3WytlncJv/TgxQC/kKOr2QpKQl94hcZuBmjIAygyM09vR6kGF 9cBh3eC4pg4avpwjD4WRaowd+Qux56r+O0YPqO3zWk3j3xpsEXLOr3xXOq8ttS0zJzys 7XbVKvN8Ofg76Oe/5rq7l0w4uhRdBL2vO818ewT34eP3hFv69u9aYYGDaLIHYRGppHZr oFHH29Vcg8UR+AbLTwUmqg8r2v704TYv1SHoWmOUCjXc+2lBC0gIONRny4U2LIBtoiVW aaQselNt4el3jqyKIwSx3psKMyVGZHge48BXKxMyC/QzTXRHbnrFkuL2AqHcv3jMJQR9 R+uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=pp+putYic/YPhOPXhgtuPLfFxxGHo2lzSEwyNyMGA0M=; b=jNNuu25ytcHa6w0S92jqqbMY66k6kPQIcyDmwSoeQsWzg3QJYKVuUkxX1QOHJsYijS iWxarL11jqFU52eS4QhoTSKpNZzXhP4Y1XhgKqRphaySUobcDSOFS8Jm5PpzxhhCfniq pHP2IJjC0lropw65kRmnBf55VI28sFjBcPhsE2Eo66ik38Af8FkArpajJFz9n5AOqPZZ 7DkpxMh2RnYQehCSnwOaKsSF2J9Qr0e1LT17ikUrUnHp1WdS4Ha5FzwG7HTzyKMamZpo EQd9kJWgSCgXI6v16qD7EGFIl4n7pdHuvtwixehhXEMtXK2Ppz2U3Xhr84/vaeP9zF+O Umkg== X-Gm-Message-State: APjAAAWeMyo9dESPvH0xF8SC4OkAI6TBi9pg5ZuEAiyVRW59vFPfckJ6 jwrNjGZLP6iS1BhwXjoqTiRlM9HF X-Google-Smtp-Source: APXvYqxdc/q+ddEc1V2hhN65KO9lAztsfu4Fdga3F1cYR8a44aH/kzkeY9mGiMsMZdJ/HDWBiVjwFA== X-Received: by 2002:a05:6000:1252:: with SMTP id j18mr330646wrx.103.1580236009282; Tue, 28 Jan 2020 10:26:49 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a184sm4088889wmf.29.2020.01.28.10.26.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 10:26:48 -0800 (PST) Message-Id: <2ad4d3e467a7e2be679de4084e54f426aa242bd6.1580236003.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Tue, 28 Jan 2020 18:26:37 +0000 Subject: [PATCH v3 06/12] sparse-checkout: cone mode does not recognize "**" Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: me@ttaylorr.com, peff@peff.net, newren@gmail.com, Derrick Stolee , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee When core.sparseCheckoutCone is enabled, the 'git sparse-checkout set' command creates a restricted set of possible patterns that are used by a custom algorithm to quickly match those patterns. If a user manually edits the sparse-checkout file, then they could create patterns that do not match these expectations. The cone-mode matching algorithm can return incorrect results. The solution is to detect these incorrect patterns, warn that we do not recognize them, and revert to the standard algorithm. Check each pattern for the "**" substring, and revert to the old logic if seen. While technically a "//**" pattern matches the meaning of "//", it is not one that would be written by the sparse-checkout builtin in cone mode. Attempting to accept that pattern change complicates the logic and instead we punt and do not accept any instance of "**". Signed-off-by: Derrick Stolee --- dir.c | 7 +++++- t/t1091-sparse-checkout-builtin.sh | 34 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dir.c b/dir.c index 22d08e61c2..40fed73a94 100644 --- a/dir.c +++ b/dir.c @@ -651,11 +651,16 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern return; } + if (strstr(given->pattern, "**")) { + /* Not a cone pattern. */ + warning(_("unrecognized pattern: '%s'"), given->pattern); + goto clear_hashmaps; + } + if (given->patternlen > 2 && !strcmp(given->pattern + given->patternlen - 2, "/*")) { if (!(given->flags & PATTERN_FLAG_NEGATIVE)) { /* Not a cone pattern. */ - pl->use_cone_patterns = 0; warning(_("unrecognized pattern: '%s'"), given->pattern); goto clear_hashmaps; } diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index cf4a595c86..e2e45dc7fd 100755 --- a/t/t1091-sparse-checkout-builtin.sh +++ b/t/t1091-sparse-checkout-builtin.sh @@ -305,4 +305,38 @@ test_expect_success 'different sparse-checkouts with worktrees' ' check_files worktree a deep ' +check_read_tree_errors () { + REPO=$1 + FILES=$2 + ERRORS=$3 + git -C $REPO read-tree -mu HEAD 2>err && + if test -z "$ERRORS" + then + test_must_be_empty err + else + test_i18ngrep "$ERRORS" err + fi && + check_files $REPO $FILES +} + +test_expect_success 'pattern-checks: /A/**' ' + cat >repo/.git/info/sparse-checkout <<-\EOF && + /* + !/*/ + /folder1/** + EOF + check_read_tree_errors repo "a folder1" "disabling cone pattern matching" +' + +test_expect_success 'pattern-checks: /A/**/B/' ' + cat >repo/.git/info/sparse-checkout <<-\EOF && + /* + !/*/ + /deep/**/deepest + EOF + check_read_tree_errors repo "a deep" "disabling cone pattern matching" && + check_files repo/deep "deeper1" && + check_files repo/deep/deeper1 "deepest" +' + test_done -- gitgitgadget