From patchwork Wed Mar 17 13:28:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12145733 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 BE021C433E6 for ; Wed, 17 Mar 2021 13:29:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A44564F50 for ; Wed, 17 Mar 2021 13:29:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231180AbhCQN2v (ORCPT ); Wed, 17 Mar 2021 09:28:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230519AbhCQN2e (ORCPT ); Wed, 17 Mar 2021 09:28:34 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50305C06175F for ; Wed, 17 Mar 2021 06:28:34 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id v11so1819884wro.7 for ; Wed, 17 Mar 2021 06:28:34 -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=i+pCy7WoqO74l7bWg2UK8UI4TswBi9zS2rQx38AxTvI=; b=Rx3Quq2tOEu0Eq9Ztp6OkLzfPmKcUMJfMNImLT1yunSJ+dlRS3KA4LCOo5rg7+DUz7 OrPsDHvnwXceRPlkQgZjI2vqk5hAKcEea2ZlXdFmza2NY+9ym9LhFY20zz2Ynz/q/dK3 j44eIQ554VXa+xnpAZnO+3OQj+MXzmyq5ujwHr0KVdsh3SASNmgrWvGvnvK+jmpon0p2 bo83n3Ry3m93XXOTEzz9VmSTToh5qCb6f5Q4JyQb00pmceNxb2LE/UL+mDZ1woZ8vAtn BfM7OOAm/5TVTziUG0+4zeLNaQDoCU8N5+cmuv5uu6kqyXUuSfxk14ioLionivkPkqiF 5oRw== 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=i+pCy7WoqO74l7bWg2UK8UI4TswBi9zS2rQx38AxTvI=; b=WkpxEl41Ltqh+qe82ir7/5PFmjoyWatGQlbX5v92Dl9BvCytW13+kGR4XYhSfZ+Ckc tsn8byMui35sc8Cr413g2PZsZFwDkFzBwzE+4nuEPtxM0YWccAqZLuojMTzlHKle7fiG 3aHxpi2y0z7l6+FZ4X0pA7atVCYImZ204hEMQzFI4zf7po38bejQFnahucBI2190p5kZ 9TDB9fct+sShJAjH3QEC+Z8aR1UhQIrt0W9HrjIi3Bxi9N3HpoLdz9//0Ji1qI0Wj9u9 5Lknh17JUJpSXzIVT0tvh74xZxdWVs6vzB96318QdcGSBt+VVX/38J5deazRNHFMbZYl vcxg== X-Gm-Message-State: AOAM5339hvA7xy3Ep7S4zeWnNTDP60wQ/Bo7yyX6KpLTwzheCEiFMGKN 5SDMUsCPkuiHRPpLocev+nEK4e9vchqJpw== X-Google-Smtp-Source: ABdhPJxrfdx4DWp+XltBzyOgnpSf3uhboXNWoLlKiVhkSgw1XJUWSxIPBkJEhnpPIK3eLF7FVUBi4w== X-Received: by 2002:a5d:468e:: with SMTP id u14mr4488125wrq.359.1615987712818; Wed, 17 Mar 2021 06:28:32 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z7sm26061448wrt.70.2021.03.17.06.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 06:28:31 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: newren@gmail.com, gitster@pobox.com, pclouds@gmail.com, jrnieder@gmail.com, =?utf-8?q?Martin_=C3=85gren?= , Derrick Stolee , =?utf-8?q?SZEDER_G=C3=A1bor?= , =?utf-8?b?w4Z2YXIg?= =?utf-8?b?QXJuZmrDtnLDsCBCamFybWFzb24=?= , Derrick Stolee , dstolee@microsoft.com Subject: [RFC/PATCH 1/5] ls-files: defer read_index() after parse_options() etc. Date: Wed, 17 Mar 2021 14:28:10 +0100 Message-Id: <20210317132814.30175-2-avarab@gmail.com> X-Mailer: git-send-email 2.31.0.260.g719c683c1d In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Move the reading of the index below the parsing of options. We'll need to setup some index options in the next commit after option parsing, but in any case it makes sense to give parse_options() handling a chance to die early before we perform the more expensive operation of reading the index. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/ls-files.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 13bcc2d847..eb72d16493 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -681,9 +681,6 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) prefix_len = strlen(prefix); git_config(git_default_config, NULL); - if (repo_read_index(the_repository) < 0) - die("index file corrupt"); - argc = parse_options(argc, argv, prefix, builtin_ls_files_options, ls_files_usage, 0); pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option"); @@ -743,6 +740,12 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) max_prefix = common_prefix(&pathspec); max_prefix_len = get_common_prefix_len(max_prefix); + /* + * Read the index after parse options etc. have had a chance + * to die early. + */ + if (repo_read_index(the_repository) < 0) + die("index file corrupt"); prune_index(the_repository->index, max_prefix, max_prefix_len); /* Treat unmatching pathspec elements as errors */ From patchwork Wed Mar 17 13:28:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12145735 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 E1CD5C433DB for ; Wed, 17 Mar 2021 13:29:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8994464F45 for ; Wed, 17 Mar 2021 13:29:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231182AbhCQN2w (ORCPT ); Wed, 17 Mar 2021 09:28:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230525AbhCQN2f (ORCPT ); Wed, 17 Mar 2021 09:28:35 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E883C06175F for ; Wed, 17 Mar 2021 06:28:35 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id o16so1840784wrn.0 for ; Wed, 17 Mar 2021 06:28:35 -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=ACCj49hyr765l6Gy6oWTa7XyouF3E3+19J/B1RsAP1Y=; b=YyhGixSDLhXXfn5XPVoK7ElsyDi2B1Q/4qM04fgWUtafzKgZOzH8eWG5yRsTNN491X Ngb/1H8hu6oi9pQThC/0KyFtkpgarSYCIrKRtym132f1h2ioyHsIqM5CyuvNt47thqdA uoaip4PLJZxs8eTIZ3qhcXgummcYvCaOyLfeXFZtu4lDh3xgFUebpEaxtmrTsYArXC/E S6+8F1CEnp+Ux1IgRUhnQirZ35QhvXjvCg6dtY6kFtO3JwMzgRdH66/EZLLDm/UbfVmR WFPSFEwhNt9ZxUR7n+Zso15SN0vKpwQ/DsjhVYApo/H4mG117p5sCKvzkjXSkNRurLt8 dzXA== 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=ACCj49hyr765l6Gy6oWTa7XyouF3E3+19J/B1RsAP1Y=; b=HYKSJFclowoaii/aTkaderSlKIKfItitnarVImOFDcJJPVs7NXczp5eRN4/HJwIdfx h6dNKtnEzqQuLM2KePxHHlPbXTwqtmw7k+96+f1QTHQkdsbtgGJ4GBPqQ7D3vtBjEw1Q 9VqnI03JMSan6usUWVFRZpvX339wWTU0/iwrHMI9TUWzwY4UKnXzVmGZzlu4OP2SdmXQ xLS0VSgRM/MUEXEgx+dQ39auJoiTQpljPvR+ScFelkhAnP0wbgitBAaeYllk8KU395Zx sSbrwarDXzaeazJDNUU0cIfYLWDiKboQRlTZ3qYbah7AFcMGwM+XUdGtR7X3X0pATpfk +TWQ== X-Gm-Message-State: AOAM533pfB3b9j7ZBogM838R7IQuTQ4lF65rkAHVUZyRs6ASGVML35OO jfhds/h8qpVyOLvxxz1AX8TGOjL7YmVyNg== X-Google-Smtp-Source: ABdhPJwwR+CtnoYAVdYD+wLCOX2O1y+NcpK4ERAbu63WxSswogI8bB79JxK0KjeCR5WROgtI3o7Taw== X-Received: by 2002:a5d:4532:: with SMTP id j18mr4363239wra.239.1615987713992; Wed, 17 Mar 2021 06:28:33 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z7sm26061448wrt.70.2021.03.17.06.28.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 06:28:33 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: newren@gmail.com, gitster@pobox.com, pclouds@gmail.com, jrnieder@gmail.com, =?utf-8?q?Martin_=C3=85gren?= , Derrick Stolee , =?utf-8?q?SZEDER_G=C3=A1bor?= , =?utf-8?b?w4Z2YXIg?= =?utf-8?b?QXJuZmrDtnLDsCBCamFybWFzb24=?= , Derrick Stolee , dstolee@microsoft.com Subject: [RFC/PATCH 2/5] ls-files: make "mode" in show_ce() loop a variable Date: Wed, 17 Mar 2021 14:28:11 +0100 Message-Id: <20210317132814.30175-3-avarab@gmail.com> X-Mailer: git-send-email 2.31.0.260.g719c683c1d In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In a subsequent commit I'll optionally change the mode in a new sparse mode, let's do this first to make that change smaller. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/ls-files.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index eb72d16493..4db75351f2 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -242,9 +242,17 @@ static void show_ce(struct repository *repo, struct dir_struct *dir, if (!show_stage) { fputs(tag, stdout); } else { + unsigned int mode = ce->ce_mode; + if (show_sparse && S_ISSPARSEDIR(mode)) + /* + * We could just do & 0177777 all the + * time, just make it clear this is + * for --stage-sparse. + */ + mode &= 0177777; printf("%s%06o %s %d\t", tag, - ce->ce_mode, + mode, find_unique_abbrev(&ce->oid, abbrev), ce_stage(ce)); } From patchwork Wed Mar 17 13:28:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12145737 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 12CC8C433E9 for ; Wed, 17 Mar 2021 13:29:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B4D6B64F5E for ; Wed, 17 Mar 2021 13:29:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231186AbhCQN2x (ORCPT ); Wed, 17 Mar 2021 09:28:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230526AbhCQN2h (ORCPT ); Wed, 17 Mar 2021 09:28:37 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9635BC06175F for ; Wed, 17 Mar 2021 06:28:36 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id x16so1830200wrn.4 for ; Wed, 17 Mar 2021 06:28:36 -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=KR64Jj+2t6866ECYBYFZOD39qZgshHf7lAYmZv1hc+4=; b=BGdd2UvHejYq3ZTdEjfKMz8hemZregjjC8SFxYPaWlYp5/2GDBbPtAfyzpwTZrtaTA 719fv8+ZKsFBm6ceU4an6K2cM6lrhwHLyHEvjzig9BPt90OtWRNDuZ0c/XPteFmqlXq/ OJwm5ZiUMPUL4Qqr7rKY8BTo7hCe9LZNui11VHybSRYlIclJmzEFe2JNbXeaVRyVeDO9 YoxsPqVTj4nJzDtCLxM4u1I0bnTcHuYqAsfru29clW/l7FWqJjEVJhze19icd0Hz3J6o Gv37Ug4uemx8Z1ug92yP7D10GDCEnPvW/Nnb1popDYxHoHcWc66sQqSBNrmiH1ecBYRi NL0w== 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=KR64Jj+2t6866ECYBYFZOD39qZgshHf7lAYmZv1hc+4=; b=eWin5Ca0xVSTXElhImbH9YMWQ36wvmxsEbDSdeWmwQU87Tad0BjLwVRa4uSAF5yiTY d/TUYV3pkjWwPYScJY9hrN42O6kzjc1R+8S78kENRAS+pdeIrWyZqbdyXs97GKM+ifnq DaaFu4Qzvz+MLKNinofqIGsTCnxtc8K3rAYeDx72RgD8+T75RiOAp7QCqediAABFgSM8 R/tuJyBhXQA1yPRHShANh7I3ghqr1fM9w7gnVqeaYOzew33cjze1Ai4pYaYeDWByIU77 G4gelLGW11v8W2Lfwww97dpmK7Yn4GhaU/T4COFXHPZLsZGTyhR5j83XgYm2ueGNhI// Bd3A== X-Gm-Message-State: AOAM533GnU8cbLhr+5RV9lBnpoyst+qXk3RTYHZ22FZm+SB1CV80zXWE UElWymDCKVw5IQhSWoVgI3ue8a8dRXPuzw== X-Google-Smtp-Source: ABdhPJxwPxXTkOTmT6bM7L7cdp8fitsj1iIXnIFHt0Z0S2EMdrAv9Lrugske2dlCuamdOJeyOQV02A== X-Received: by 2002:a5d:64ae:: with SMTP id m14mr4452773wrp.153.1615987715059; Wed, 17 Mar 2021 06:28:35 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z7sm26061448wrt.70.2021.03.17.06.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 06:28:34 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: newren@gmail.com, gitster@pobox.com, pclouds@gmail.com, jrnieder@gmail.com, =?utf-8?q?Martin_=C3=85gren?= , Derrick Stolee , =?utf-8?q?SZEDER_G=C3=A1bor?= , =?utf-8?b?w4Z2YXIg?= =?utf-8?b?QXJuZmrDtnLDsCBCamFybWFzb24=?= , Derrick Stolee , dstolee@microsoft.com Subject: [RFC/PATCH 3/5] ls-files: add and use a new --sparse option Date: Wed, 17 Mar 2021 14:28:12 +0100 Message-Id: <20210317132814.30175-4-avarab@gmail.com> X-Mailer: git-send-email 2.31.0.260.g719c683c1d In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-ls-files.txt | 4 ++ builtin/ls-files.c | 10 ++++- t/t1091-sparse-checkout-builtin.sh | 9 ++-- t/t1092-sparse-checkout-compatibility.sh | 57 ++++++++++++++++-------- 4 files changed, 56 insertions(+), 24 deletions(-) diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 6d11ab506b..1145e960a4 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -71,6 +71,10 @@ OPTIONS --unmerged:: Show unmerged files in the output (forces --stage) +--sparse:: + Show sparse directories in the output instead of expanding + them (forces --stage) + -k:: --killed:: Show files on the filesystem that need to be removed due diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 4db75351f2..1ebbb63c10 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -26,6 +26,7 @@ static int show_deleted; static int show_cached; static int show_others; static int show_stage; +static int show_sparse; static int show_unmerged; static int show_resolve_undo; static int show_modified; @@ -639,6 +640,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) DIR_SHOW_IGNORED), OPT_BOOL('s', "stage", &show_stage, N_("show staged contents' object name in the output")), + OPT_BOOL(0, "sparse", &show_sparse, + N_("show unexpanded sparse directories in the output")), OPT_BOOL('k', "killed", &show_killed, N_("show files on the filesystem that need to be removed")), OPT_BIT(0, "directory", &dir.flags, @@ -705,12 +708,17 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) tag_skip_worktree = "S "; tag_resolve_undo = "U "; } + if (show_sparse) { + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + } if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed) require_work_tree = 1; - if (show_unmerged) + if (show_unmerged || show_sparse) /* * There's no point in showing unmerged unless * you also show the stage information. + * The same goes for the --sparse option. */ show_stage = 1; if (show_tag || show_stage) diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index ff1ad570a2..c823df423c 100755 --- a/t/t1091-sparse-checkout-builtin.sh +++ b/t/t1091-sparse-checkout-builtin.sh @@ -208,12 +208,13 @@ test_expect_success 'sparse-checkout disable' ' test_expect_success 'sparse-index enabled and disabled' ' git -C repo sparse-checkout init --cone --sparse-index && test_cmp_config -C repo true extensions.sparseIndex && - test-tool -C repo read-cache --table >cache && - grep " tree " cache && + git -C repo ls-files --sparse >cache && + grep "^040000 " cache >lines && + test_line_count = 3 lines && git -C repo sparse-checkout disable && - test-tool -C repo read-cache --table >cache && - ! grep " tree " cache && + git -C repo ls-files --sparse >cache && + ! grep "^040000 " cache && git -C repo config --list >config && ! grep extensions.sparseindex config ' diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index d97bf9b645..48d3920490 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -136,48 +136,67 @@ test_sparse_match () { test_cmp sparse-checkout-err sparse-index-err } +test_index_entry_like () { + dir=$1 + shift + fmt=$1 + shift + rev=$1 + shift + entry=$1 + shift + file=$1 + shift + hash=$(git -C "$dir" rev-parse "$rev") && + printf "$fmt\n" "$hash" "$entry" >expected && + if grep "$entry" "$file" >line + then + test_cmp expected line + else + cat cache && + false + fi +} + test_expect_success 'sparse-index contents' ' init_repos && - test-tool -C sparse-index read-cache --table >cache && + git -C sparse-index ls-files --sparse >cache && for dir in folder1 folder2 x do - TREE=$(git -C sparse-index rev-parse HEAD:$dir) && - grep "040000 tree $TREE $dir/" cache \ - || return 1 + test_index_entry_like sparse-index "040000 %s 0\t%s" "HEAD:$dir" "$dir/" cache || return 1 done && git -C sparse-index sparse-checkout set folder1 && - test-tool -C sparse-index read-cache --table >cache && + git -C sparse-index ls-files --sparse >cache && for dir in deep folder2 x do - TREE=$(git -C sparse-index rev-parse HEAD:$dir) && - grep "040000 tree $TREE $dir/" cache \ - || return 1 + test_index_entry_like sparse-index "040000 %s 0\t%s" "HEAD:$dir" "$dir/" cache || return 1 done && git -C sparse-index sparse-checkout set deep/deeper1 && - test-tool -C sparse-index read-cache --table >cache && + git -C sparse-index ls-files --sparse >cache && for dir in deep/deeper2 folder1 folder2 x do - TREE=$(git -C sparse-index rev-parse HEAD:$dir) && - grep "040000 tree $TREE $dir/" cache \ - || return 1 + test_index_entry_like sparse-index "040000 %s 0\t%s" "HEAD:$dir" "$dir/" cache || return 1 done && + grep 040000 cache >lines && + test_line_count = 4 lines && + # Disabling the sparse-index removes tree entries with full ones git -C sparse-index sparse-checkout init --no-sparse-index && - test-tool -C sparse-index read-cache --table >cache && - ! grep "040000 tree" cache && - test_sparse_match test-tool read-cache --table + git -C sparse-index ls-files --sparse >cache && + ! grep "^040000 " cache >lines && + test_sparse_match git ls-tree -r HEAD ' test_expect_success 'expanded in-memory index matches full index' ' init_repos && - test_sparse_match test-tool read-cache --expand --table + test_sparse_match git ls-tree -r HEAD ' test_expect_success 'status with options' ' @@ -394,9 +413,9 @@ test_expect_success 'submodule handling' ' test_all_match git commit -m "add submodule" && # having a submodule prevents "modules" from collapse - test-tool -C sparse-index read-cache --table >cache && - grep "100644 blob .* modules/a" cache && - grep "160000 commit $(git -C initial-repo rev-parse HEAD) modules/sub" cache + git -C sparse-index ls-files --sparse >cache && + test_index_entry_like sparse-index "100644 %s 0\t%s" "HEAD:modules/a" "modules/a" cache && + test_index_entry_like sparse-index "160000 %s 0\t%s" "HEAD:modules/sub" "modules/sub" cache ' test_expect_success 'sparse-index is expanded and converted back' ' From patchwork Wed Mar 17 13:28:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12145739 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 616B3C4332D for ; Wed, 17 Mar 2021 13:29:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2ED4464F50 for ; Wed, 17 Mar 2021 13:29:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231196AbhCQN2z (ORCPT ); Wed, 17 Mar 2021 09:28:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231151AbhCQN2s (ORCPT ); Wed, 17 Mar 2021 09:28:48 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7924DC06175F for ; Wed, 17 Mar 2021 06:28:37 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id e9so1815016wrw.10 for ; Wed, 17 Mar 2021 06:28:37 -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=jI0c6IHLJzOwG3N4LGmnbajKDd/cYx+1zw642J9NzAE=; b=NgkrEyNd8z0afKp8TnS1/nZkLl92mQ+y4oERZRc4GLpjjnQrwnmJESmTY9N9nEVvaA Wjp/yeWQAV2OIs/6LhM7cZ9vsrTHHi4ZtSbTBGOeJKFDi7g5xBT5tL4XWaG0zmCMDSpG PcC0Jaez/c3/mcN7gnorD3+L1g6QkAEo9wL8LF0t2LRNdUMJIQ2SPYGZfO192IttvWRb JlY4d0F1ENi0cASX5Y+59yClhJ2MIuuowVVEENZz8omEJ2GLcT4NyqEA62MqNCoKmPWF VGterBKIxA4osWJk/bC7aE43PsBYy5NR+F0METmUO8mukd+8oxaHCjwa1TCXTtHNdbZf /PGg== 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=jI0c6IHLJzOwG3N4LGmnbajKDd/cYx+1zw642J9NzAE=; b=KiHu0D2Rm4QIHgArJKl9CQJ1ottnBb7rxTe1dQAzGt6JkvHxnwUxpwY+O8jqwe7bsx E0bAAkf6N+ouxLUkmv2y48mLKwKzd4v82v+MhND45xwBzusjZthprHN2MWP2abrgFExa u06MUOzab/iFiOkpx3UREtqmYtTfMdJ+eRv/MyDZCyur5hwvCKN82Yc/CJjj056e6mks rDYALPjvtu9oNRk4BnPT/3ObfIch3ORjkY40ZcIXz7AWENwBQb3kdDEnFMTm79UKINug qeGjcav7mz35PAWAYUToO5j8qb8hBdbia9Kw40Slh1kFueB2mngHBZL9xDEhvYTvwTwr RJKA== X-Gm-Message-State: AOAM532VWpTTWIDVBi3q+zJ7tMd3t/YHos6uu09piRSYD3W5VbOoerpD zJfL01YznxKQYfdAcFWUm2lCD4FsvtaftA== X-Google-Smtp-Source: ABdhPJxZUhE1lejdLW6SOnW5v7kEcBxAibK9o6tVzyi4H+/67F8fOC1ffNGeFJIb19IQw7W3zlr+Ag== X-Received: by 2002:adf:fb0b:: with SMTP id c11mr4494979wrr.425.1615987715952; Wed, 17 Mar 2021 06:28:35 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z7sm26061448wrt.70.2021.03.17.06.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 06:28:35 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: newren@gmail.com, gitster@pobox.com, pclouds@gmail.com, jrnieder@gmail.com, =?utf-8?q?Martin_=C3=85gren?= , Derrick Stolee , =?utf-8?q?SZEDER_G=C3=A1bor?= , =?utf-8?b?w4Z2YXIg?= =?utf-8?b?QXJuZmrDtnLDsCBCamFybWFzb24=?= , Derrick Stolee , dstolee@microsoft.com Subject: [RFC/PATCH 4/5] test-tool read-cache: --table is redundant to ls-files Date: Wed, 17 Mar 2021 14:28:13 +0100 Message-Id: <20210317132814.30175-5-avarab@gmail.com> X-Mailer: git-send-email 2.31.0.260.g719c683c1d In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Ævar Arnfjörð Bjarmason --- t/helper/test-read-cache.c | 43 -------------------------------------- 1 file changed, 43 deletions(-) diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c index b52c174acc..2499999af3 100644 --- a/t/helper/test-read-cache.c +++ b/t/helper/test-read-cache.c @@ -1,54 +1,16 @@ #include "test-tool.h" #include "cache.h" #include "config.h" -#include "blob.h" -#include "commit.h" -#include "tree.h" -#include "sparse-index.h" - -static void print_cache_entry(struct cache_entry *ce) -{ - const char *type; - printf("%06o ", ce->ce_mode & 0177777); - - if (S_ISSPARSEDIR(ce->ce_mode)) - type = tree_type; - else if (S_ISGITLINK(ce->ce_mode)) - type = commit_type; - else - type = blob_type; - - printf("%s %s\t%s\n", - type, - oid_to_hex(&ce->oid), - ce->name); -} - -static void print_cache(struct index_state *istate) -{ - int i; - for (i = 0; i < istate->cache_nr; i++) - print_cache_entry(istate->cache[i]); -} int cmd__read_cache(int argc, const char **argv) { struct repository *r = the_repository; int i, cnt = 1; const char *name = NULL; - int table = 0, expand = 0; - - initialize_the_repository(); - prepare_repo_settings(r); - r->settings.command_requires_full_index = 0; for (++argv, --argc; *argv && starts_with(*argv, "--"); ++argv, --argc) { if (skip_prefix(*argv, "--print-and-refresh=", &name)) continue; - if (!strcmp(*argv, "--table")) - table = 1; - else if (!strcmp(*argv, "--expand")) - expand = 1; } if (argc == 1) @@ -59,9 +21,6 @@ int cmd__read_cache(int argc, const char **argv) for (i = 0; i < cnt; i++) { repo_read_index(r); - if (expand) - ensure_full_index(r->index); - if (name) { int pos; @@ -74,8 +33,6 @@ int cmd__read_cache(int argc, const char **argv) ce_uptodate(r->index->cache[pos]) ? "" : " not"); write_file(name, "%d\n", i); } - if (table) - print_cache(r->index); discard_index(r->index); } return 0; From patchwork Wed Mar 17 13:28:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12145743 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 399A1C43381 for ; Wed, 17 Mar 2021 13:29:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0D28F64F45 for ; Wed, 17 Mar 2021 13:29:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231189AbhCQN2y (ORCPT ); Wed, 17 Mar 2021 09:28:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231137AbhCQN2j (ORCPT ); Wed, 17 Mar 2021 09:28:39 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AF3BC061760 for ; Wed, 17 Mar 2021 06:28:38 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id y124-20020a1c32820000b029010c93864955so3377156wmy.5 for ; Wed, 17 Mar 2021 06:28:38 -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=u3TFlgltYvc50tTPtlZGXggR2zaCmsjuG7+xA3uhBWE=; b=Rm9f3LsleApTQ0dEmNS+U98fmBB781sZQylZuoysdRjTTMzNPwS+kNftJ1Caxx0syb /c66b2qx8bzkAv0QlVRBzOAj33BzHid644QQTkUeJtm0ZMSMjXeVPJQBhzWFOWKFnKsh qRDz0YZ9Q5up4LMwxR5/tkhB2bCL0R+xOJxw9ssXvozwCrUVVirMc59Esof4Z99hlfdw ttd7FUYfNhqsIch3YyRZDnfqCpOIHoHzojR9chFKiwFFX4/Pcat4/mk6wkQIkNVr8jb9 QL0+ua8jHho0umeX4LLSon4SZNCBwDkQMvcXNrgKaCJ7JFu/9+EkOxNmmkjOSokj+BRg gQ6w== 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=u3TFlgltYvc50tTPtlZGXggR2zaCmsjuG7+xA3uhBWE=; b=PXFowwLOdK1QWQhbyHWcs2fOA1zigBngi3Yi6sRzfybYDTBVNEz8DSNTVHj6ewYVx+ Vpn/nhpUSIVx8vthKcbCC5sOAXd/8za+wxdJgt6W4Sfkd9nDC67CVTJOoISv2bUYRdmU S0bzwNIrTOY8rbV4afezjIelnav3M2iHnRgUjWY77z9nQZvGVLq9693u9SMgZZviEhyk PbVbi1Ap7XazDNJ0HMd/0mYhpLrqWHlZv8WHQq5yJHn8mTGRClfDSKz4pPSFem4OgSzc YghVcVNLGbMeJrJe1mmYrvohO4lAg48VdIfSuIGs9gz9BTMCbKUSEkx8flIj1r7yeq2A WMGw== X-Gm-Message-State: AOAM530C+byyi3LuNZxdc6fuezW6pM0UpMZ/MOWwSBfQsyBf/TKFFgYO HyA1kAF3SzzT36TvztHbrEcPyMRiTJEhQQ== X-Google-Smtp-Source: ABdhPJy6Iuudil9yGfh2mXIwczcO73RDv4VLb7vJqPJJXcAfP6fYOqQH3M9CERaMlsP3eSsxGcQRSQ== X-Received: by 2002:a7b:cb99:: with SMTP id m25mr3875340wmi.64.1615987716905; Wed, 17 Mar 2021 06:28:36 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z7sm26061448wrt.70.2021.03.17.06.28.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 06:28:36 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: newren@gmail.com, gitster@pobox.com, pclouds@gmail.com, jrnieder@gmail.com, =?utf-8?q?Martin_=C3=85gren?= , Derrick Stolee , =?utf-8?q?SZEDER_G=C3=A1bor?= , =?utf-8?b?w4Z2YXIg?= =?utf-8?b?QXJuZmrDtnLDsCBCamFybWFzb24=?= , Derrick Stolee , dstolee@microsoft.com Subject: [RFC/PATCH 5/5] test-tool: split up test-tool read-cache Date: Wed, 17 Mar 2021 14:28:14 +0100 Message-Id: <20210317132814.30175-6-avarab@gmail.com> X-Mailer: git-send-email 2.31.0.260.g719c683c1d In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since the "test-tool read-cache" was originally added back in 1ecb5ff141 (read-cache: add simple performance test, 2013-06-09) it's been growing all sorts of bells and whistles that aren't very conducive to performance testing the index, e.g. it learned how to read config. Let's split what remains of the "test-tool read-cache" into the two narrow use-cases it's used for. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 3 ++- t/helper/test-read-cache-again.c | 31 +++++++++++++++++++++++++ t/helper/test-read-cache-perf.c | 21 +++++++++++++++++ t/helper/test-read-cache.c | 39 -------------------------------- t/helper/test-tool.c | 3 ++- t/helper/test-tool.h | 3 ++- t/perf/p0002-read-cache.sh | 2 +- t/t7519-status-fsmonitor.sh | 2 +- 8 files changed, 60 insertions(+), 44 deletions(-) create mode 100644 t/helper/test-read-cache-again.c create mode 100644 t/helper/test-read-cache-perf.c delete mode 100644 t/helper/test-read-cache.c diff --git a/Makefile b/Makefile index 89b1d53741..a1bbb818d9 100644 --- a/Makefile +++ b/Makefile @@ -724,7 +724,8 @@ TEST_BUILTINS_OBJS += test-prio-queue.o TEST_BUILTINS_OBJS += test-proc-receive.o TEST_BUILTINS_OBJS += test-progress.o TEST_BUILTINS_OBJS += test-reach.o -TEST_BUILTINS_OBJS += test-read-cache.o +TEST_BUILTINS_OBJS += test-read-cache-again.o +TEST_BUILTINS_OBJS += test-read-cache-perf.o TEST_BUILTINS_OBJS += test-read-graph.o TEST_BUILTINS_OBJS += test-read-midx.o TEST_BUILTINS_OBJS += test-ref-store.o diff --git a/t/helper/test-read-cache-again.c b/t/helper/test-read-cache-again.c new file mode 100644 index 0000000000..5e20ca1c8f --- /dev/null +++ b/t/helper/test-read-cache-again.c @@ -0,0 +1,31 @@ +#include "test-tool.h" +#include "cache.h" + +int cmd__read_cache_again(int argc, const char **argv) +{ + struct repository *r = the_repository; + int cnt; + const char *name; + + if (argc != 2) + die("usage: test-tool read-cache-again "); + + cnt = strtol(argv[0], NULL, 0); + name = argv[2]; + + setup_git_directory(); + while (cnt--) { + int pos; + repo_read_index(r); + refresh_index(r->index, REFRESH_QUIET, + NULL, NULL, NULL); + pos = index_name_pos(r->index, name, strlen(name)); + if (pos < 0) + die("%s not in index", name); + printf("%s is%s up to date\n", name, + ce_uptodate(r->index->cache[pos]) ? "" : " not"); + write_file(name, "%d\n", cnt); + discard_index(r->index); + } + return 0; +} diff --git a/t/helper/test-read-cache-perf.c b/t/helper/test-read-cache-perf.c new file mode 100644 index 0000000000..ac9c297efa --- /dev/null +++ b/t/helper/test-read-cache-perf.c @@ -0,0 +1,21 @@ +#include "test-tool.h" +#include "cache.h" + +int cmd__read_cache_perf(int argc, const char **argv) +{ + struct repository *r = the_repository; + int cnt = 1000; + + if (argc == 1) + cnt = strtol(argv[0], NULL, 0); + else if (argc) + die("usage: test-tool read-cache-perf []"); + + setup_git_directory(); + while (cnt--) { + repo_read_index(r); + discard_index(r->index); + } + + return 0; +} diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c deleted file mode 100644 index 2499999af3..0000000000 --- a/t/helper/test-read-cache.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "test-tool.h" -#include "cache.h" -#include "config.h" - -int cmd__read_cache(int argc, const char **argv) -{ - struct repository *r = the_repository; - int i, cnt = 1; - const char *name = NULL; - - for (++argv, --argc; *argv && starts_with(*argv, "--"); ++argv, --argc) { - if (skip_prefix(*argv, "--print-and-refresh=", &name)) - continue; - } - - if (argc == 1) - cnt = strtol(argv[0], NULL, 0); - setup_git_directory(); - git_config(git_default_config, NULL); - - for (i = 0; i < cnt; i++) { - repo_read_index(r); - - if (name) { - int pos; - - refresh_index(r->index, REFRESH_QUIET, - NULL, NULL, NULL); - pos = index_name_pos(r->index, name, strlen(name)); - if (pos < 0) - die("%s not in index", name); - printf("%s is%s up to date\n", name, - ce_uptodate(r->index->cache[pos]) ? "" : " not"); - write_file(name, "%d\n", i); - } - discard_index(r->index); - } - return 0; -} diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c index f97cd9f48a..1334fa25ba 100644 --- a/t/helper/test-tool.c +++ b/t/helper/test-tool.c @@ -52,7 +52,8 @@ static struct test_cmd cmds[] = { { "proc-receive", cmd__proc_receive}, { "progress", cmd__progress }, { "reach", cmd__reach }, - { "read-cache", cmd__read_cache }, + { "read-cache-again", cmd__read_cache_again }, + { "read-cache-perf", cmd__read_cache_perf }, { "read-graph", cmd__read_graph }, { "read-midx", cmd__read_midx }, { "ref-store", cmd__ref_store }, diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h index 28072c0ad5..d70cde8574 100644 --- a/t/helper/test-tool.h +++ b/t/helper/test-tool.h @@ -41,7 +41,8 @@ int cmd__prio_queue(int argc, const char **argv); int cmd__proc_receive(int argc, const char **argv); int cmd__progress(int argc, const char **argv); int cmd__reach(int argc, const char **argv); -int cmd__read_cache(int argc, const char **argv); +int cmd__read_cache_again(int argc, const char **argv); +int cmd__read_cache_perf(int argc, const char **argv); int cmd__read_graph(int argc, const char **argv); int cmd__read_midx(int argc, const char **argv); int cmd__ref_store(int argc, const char **argv); diff --git a/t/perf/p0002-read-cache.sh b/t/perf/p0002-read-cache.sh index cdd105a594..d0ba5173fb 100755 --- a/t/perf/p0002-read-cache.sh +++ b/t/perf/p0002-read-cache.sh @@ -8,7 +8,7 @@ test_perf_default_repo count=1000 test_perf "read_cache/discard_cache $count times" " - test-tool read-cache $count + test-tool read-cache-perf $count " test_done diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh index 45d025f960..3761a8781d 100755 --- a/t/t7519-status-fsmonitor.sh +++ b/t/t7519-status-fsmonitor.sh @@ -359,7 +359,7 @@ test_expect_success UNTRACKED_CACHE 'ignore .git changes when invalidating UNTR' test_expect_success 'discard_index() also discards fsmonitor info' ' test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" && test_might_fail git update-index --refresh && - test-tool read-cache --print-and-refresh=tracked 2 >actual && + test-tool read-cache-again 2 tracked >actual && printf "tracked is%s up to date\n" "" " not" >expect && test_cmp expect actual '