From patchwork Tue Oct 5 00:19:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 12535139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DA17C433EF for ; Tue, 5 Oct 2021 00:19:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 353CF6137D for ; Tue, 5 Oct 2021 00:19:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230207AbhJEAVi (ORCPT ); Mon, 4 Oct 2021 20:21:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229447AbhJEAVh (ORCPT ); Mon, 4 Oct 2021 20:21:37 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8248C061749 for ; Mon, 4 Oct 2021 17:19:47 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id q17-20020a25b591000000b005a07d27bbdaso25785268ybj.3 for ; Mon, 04 Oct 2021 17:19:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=kOyt5cJDCSNsk+B1ZqSGvIlZXsehDk2I7qS7YXJtVrc=; b=NHF4QLBvF4vzMTlAyLoXwhZT9TvSVxH5nfjr595N4OvpDKwEqaDvN9jtsHQMpnjA0r z238CrZm+tbJcdgcMzllgN8qp26kcMmXSJ9yaeF929Vhlj1cwVJ6a6RRVghQb2TvIBP0 v8pPJ9KbgR9+PheNcsAFkEa2DX8oTGMEZJyxwU6mkiO5tbuUBYyjxzi9AVy+gMNUsMmy UoIfAgHMIZhvJdoIClGJJfo67K+qeF/XhQK/BM8uhS12TEbQdMqM4uv+uNNVbzixlTrM Qt4YXut2V5PkjMBX+kXG9RQBGHAwgpv/o1NTGAvOwFaH5DyNi2fEKNL+DvbjNEoBClC6 xnHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=kOyt5cJDCSNsk+B1ZqSGvIlZXsehDk2I7qS7YXJtVrc=; b=GHxUroMBvTtE8Xv7EaggR9eF0klJkfETXPv4J917oobXLpx42qZWWWq61UIfdJmACr 3MEJZBKJCqoQoyyGyZuV9lkRDgXPhSqFDc4wQoxxdXCCseLCE0bN/12VALx6fqkbMZSM BcyISN6v6bDhN50tiEpF75FR3uFTxvOMuBy89LJdgWL05n/kbgqix8GUEnuD5Qh3tIHK H05Jj3ghcEVECsQkZQjgRs5BHjnhLMJrJy6gIMI9Df8aqChUwlkvydqQmRZwIuGpJS+P EPR/2TSLIfU/jOEND4y0bqrDc+sGH3mys4sds8xgm1HE035cvJ61wPfAtsr/9mE9sgi9 EtvQ== X-Gm-Message-State: AOAM533mpL/mn+iFz66NQpEkDb/+jBaNB8dUi0rwNGWqjY9SN+hVhE7S WJ8S7BtFSV80W0ncPPjR8xnfeH8Rzztr4xaGSoPhVzQOvMiBKTwm9oXdjBVaqKmUQj3ND03ShWO 6QqcvwxdTGS4AQ/SNuv0/HdHyhvzG2SEkIsLwbF4Q7qv6UFBeBOJtHKkADwLB9Oo= X-Google-Smtp-Source: ABdhPJzHvyvDMLidA7WlzJkBrwBOX2z4A7zwtdL7fKnxxbn4Q04zWklGG2HA+Sg9aT737HYM8oxrR0Xvomn9cw== X-Received: from chooglen.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:26d9]) (user=chooglen job=sendgmr) by 2002:a25:4d41:: with SMTP id a62mr18575208ybb.394.1633393186886; Mon, 04 Oct 2021 17:19:46 -0700 (PDT) Date: Mon, 4 Oct 2021 17:19:29 -0700 In-Reply-To: <20211005001931.13932-1-chooglen@google.com> Message-Id: <20211005001931.13932-2-chooglen@google.com> Mime-Version: 1.0 References: <20210917225459.68086-1-chooglen@google.com> <20211005001931.13932-1-chooglen@google.com> X-Mailer: git-send-email 2.33.0.800.g4c38ced690-goog Subject: [PATCH v3 1/3] fsck: verify commit graph when implicitly enabled From: Glen Choo To: git@vger.kernel.org Cc: Eric Sunshine , Taylor Blau , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org the_repository->settings is the preferred way to get certain settings (such as "core.commitGraph") because it gets default values from prepare_repo_settings(). However, cmd_fsck() reads the config directly via git_config_get_bool(), which bypasses these default values. This causes fsck to ignore the commit graph if "core.commitgraph" is not explicitly set in the config. This worked fine until commit-graph was enabled by default in 31b1de6a09 (commit-graph: turn on commit-graph by default, 2019-08-13). Replace git_config_get_bool("core.commitgraph") in fsck with the equivalent call to the_repository->settings.core_commit_graph. The expected behavior is that fsck respects the config value when it is set, but uses the default value when it is unset. For example, for core.commitGraph, there are three cases: - Config value is set to true -> enabled - Config value is set to false -> disabled - Config value is unset -> enabled As such, tests cover all three cases. Signed-off-by: Glen Choo --- builtin/fsck.c | 3 ++- t/t5318-commit-graph.sh | 23 ++++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c index b42b6fe21f..1c4e485b66 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -803,6 +803,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) fsck_enable_object_names(&fsck_walk_options); git_config(git_fsck_config, &fsck_obj_options); + prepare_repo_settings(the_repository); if (connectivity_only) { for_each_loose_object(mark_loose_for_connectivity, NULL, 0); @@ -908,7 +909,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) check_connectivity(); - if (!git_config_get_bool("core.commitgraph", &i) && i) { + if (the_repository->settings.core_commit_graph) { struct child_process commit_graph_verify = CHILD_PROCESS_INIT; const char *verify_argv[] = { "commit-graph", "verify", NULL, NULL, NULL }; diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index af88f805aa..4fcfc2ebbc 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -674,12 +674,33 @@ test_expect_success 'detect incorrect chunk count' ' $GRAPH_CHUNK_LOOKUP_OFFSET ' -test_expect_success 'git fsck (checks commit-graph)' ' +test_expect_success 'git fsck (checks commit-graph when config set to true)' ' cd "$TRASH_DIRECTORY/full" && git fsck && corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \ "incorrect checksum" && cp commit-graph-pre-write-test $objdir/info/commit-graph && + test_must_fail git -c core.commitGraph=true fsck +' + +test_expect_success 'git fsck (ignores commit-graph when config set to false)' ' + cd "$TRASH_DIRECTORY/full" && + git fsck && + corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \ + "incorrect checksum" && + cp commit-graph-pre-write-test $objdir/info/commit-graph && + git -c core.commitGraph=false fsck +' + +test_expect_success 'git fsck (checks commit-graph when config unset)' ' + cd "$TRASH_DIRECTORY/full" && + test_when_finished "git config core.commitGraph true" && + + git fsck && + corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \ + "incorrect checksum" && + test_unconfig core.commitGraph && + cp commit-graph-pre-write-test $objdir/info/commit-graph && test_must_fail git fsck ' From patchwork Tue Oct 5 00:19:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 12535141 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51346C433EF for ; Tue, 5 Oct 2021 00:19:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38CDA6137D for ; Tue, 5 Oct 2021 00:19:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229907AbhJEAVp (ORCPT ); Mon, 4 Oct 2021 20:21:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230402AbhJEAVn (ORCPT ); Mon, 4 Oct 2021 20:21:43 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DA93C061745 for ; Mon, 4 Oct 2021 17:19:54 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id 1-20020a630e41000000b002528846c9f2so11487296pgo.12 for ; Mon, 04 Oct 2021 17:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=R0UM0y3VANSODiJSxNqFNYon7P2nOX2ZRqfL2OtIsqg=; b=awTbRiysNVjRgHTDYtZrEiq87zxxcOmuoEv+Ls6XVACUPasnvonDDc65AkndZszgxJ yLg8LrttSsdy5BiY751HlHf0RMvJQcE8w6ukkJZWM6vJBeXg8cp/MWGS7SNvro+LQnvw +NZSKDJwlMluGr9BvS/HZwyqeEvavZyOFRnR/hqHKDlFd6hHPLh7Fs2roDSPSmhOXEZg RcGT5SNbkeAnaRvGzl9XsvRpxI0t5pSEBE/MpmmFk7Z3nIC/6s2pcqX1XDfdXmmocvHQ j3Qt2kbTZCy6b4OC337CS30auy9ykpAyWvK0KrXx/CqSHlLl7fTtjGLScC2a4mCj5Yv6 pgzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=R0UM0y3VANSODiJSxNqFNYon7P2nOX2ZRqfL2OtIsqg=; b=PYMVa6/V6HUSgoH7rrySO4XB3B6YZcEwdtjWZ0maYjVcMOnA9aLRab7JzoSN2gNZ4m lxkfi0EpnZU5UL7dFrQwo2kSRV3zj/hAgda4BaQjue+bcRw2cBhro86gqj2r4mzc/oYG rNvhyiPHvEqYekjVZ28nL5i+8qAhJodi/j0sw0AQAVI+GvnAHA3Qc324fcvVNxvw2y6g rbPNNNUB9fL4Mh3wlEy6RkTGfxpvRgcH76ey3GdznjQA6SRrCJOgbr8eb4J2vC3314eh ThU3anrgWIBETkTG467z/ZjqCDvJf0qG8UCZS4Hl1d22o5mawF0dDcrhT8CdyoPdLgnc /Oog== X-Gm-Message-State: AOAM531maQHAkJ6sqA3WszEcYe/Bn1w5w6M5i3nH+LBsI/x4fonpfcrZ dWafmgO6O9K79XqBvOslvcCbpZ0M+TkfU5eO2o4gLti8LXiIPcbtI5o2iSrprK8WBKnmasIWOoP 9X+dIINouc0WDwO00oqQpiZ8iytc4e05yroRT322QLucPocIvTaDVWinQkRxnI9w= X-Google-Smtp-Source: ABdhPJzRfXygzPrNMM4q4zCylV5ko/35OUC7EU5IUYWayTjGi26zecZbphERy7VenEyAw5bgWwRv16Hr0hnDnA== X-Received: from chooglen.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:26d9]) (user=chooglen job=sendgmr) by 2002:aa7:8609:0:b0:44b:346a:7404 with SMTP id p9-20020aa78609000000b0044b346a7404mr27619155pfn.86.1633393193555; Mon, 04 Oct 2021 17:19:53 -0700 (PDT) Date: Mon, 4 Oct 2021 17:19:30 -0700 In-Reply-To: <20211005001931.13932-1-chooglen@google.com> Message-Id: <20211005001931.13932-3-chooglen@google.com> Mime-Version: 1.0 References: <20210917225459.68086-1-chooglen@google.com> <20211005001931.13932-1-chooglen@google.com> X-Mailer: git-send-email 2.33.0.800.g4c38ced690-goog Subject: [PATCH v3 2/3] fsck: verify multi-pack-index when implictly enabled From: Glen Choo To: git@vger.kernel.org Cc: Eric Sunshine , Taylor Blau , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Like the previous commit, the_repository->settings.core_multi_pack_index is preferable to reading "core.multiPackIndex" from the config because prepare_repo_settings() sets a default value for the_repository->settings. This worked fine until core.multiPackIndex was enabled by default in 18e449f86b (midx: enable core.multiPackIndex by default, 2020-09-25). Replace git_config_get_bool("core.multiPackIndex") in fsck with the equivalent call to the_repository->settings.multi_pack_index. Signed-off-by: Glen Choo --- builtin/fsck.c | 2 +- t/t5319-multi-pack-index.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c index 1c4e485b66..5bbe8068ec 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -925,7 +925,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) } } - if (!git_config_get_bool("core.multipackindex", &i) && i) { + if (the_repository->settings.core_multi_pack_index) { struct child_process midx_verify = CHILD_PROCESS_INIT; const char *midx_argv[] = { "multi-pack-index", "verify", NULL, NULL, NULL }; diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh index 3d4d9f10c3..53958bfd1f 100755 --- a/t/t5319-multi-pack-index.sh +++ b/t/t5319-multi-pack-index.sh @@ -407,7 +407,10 @@ test_expect_success 'verify incorrect offset' ' test_expect_success 'git-fsck incorrect offset' ' corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ "incorrect object offset" \ - "git -c core.multipackindex=true fsck" + "git -c core.multiPackIndex=true fsck" && + test_unconfig core.multiPackIndex && + test_must_fail git fsck && + git -c core.multiPackIndex=false fsck ' test_expect_success 'corrupt MIDX is not reused' ' From patchwork Tue Oct 5 00:19:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 12535143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 493DEC433F5 for ; Tue, 5 Oct 2021 00:19:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3473761247 for ; Tue, 5 Oct 2021 00:19:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230369AbhJEAVq (ORCPT ); Mon, 4 Oct 2021 20:21:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230271AbhJEAVq (ORCPT ); Mon, 4 Oct 2021 20:21:46 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CB44C061745 for ; Mon, 4 Oct 2021 17:19:56 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id t4-20020a62ea04000000b0044b333f5d1bso9979197pfh.20 for ; Mon, 04 Oct 2021 17:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=gCcN3OjOStawLoGGgqtCJg0NEtHKqK3MkfEr5Vuqtk4=; b=lZAuRJI5Ikzw/9XR2ksM5q88V9nk19IFcfJfDGbdsPA3Ddj31Gf60jPIYraE2zgcjf KsKdOExi5UNkQIU/jHr8Mr7+iXRVLEiz/EYLgjae2SHDCgCW2JGQ5kDt/NeqzIGbokHk GMfTKXnGJP6HqfRabSQupz0iytJeaFudV21lf4ytje2mp0Wm17+iqDj1tW76ICxPQiY4 QEObKz0/fyHAylJLG/oL4cuysxLw+BMJ55QaZxqacdl3h0sI1hOC6klUudKBxcJ52KZQ vV9bhPGc4MIC694sRxVHdxvVCpSV6vV2XhNKPyhj20NIv8Qw3dMvLlCDTnsH1Q7e02KZ mM8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=gCcN3OjOStawLoGGgqtCJg0NEtHKqK3MkfEr5Vuqtk4=; b=PYIkffzHiJer7tdkSwvEr6tW+eyykvhm4/2eQXsPFk/mWeg5x4khmHtMQbCg3fiWcl vTQtmv5xafLiQ+qqiUbTBMJdjLIYh6rR35YoUv6xURNmeSBmWpFaw37pWP/koWZYl6QA ax3O1PTR4YZ1k1bpmVl6ebFvvgoxPc6WstG8VDt9/i6fbDWa7x2p81FiC6g2flR8bY+k cCqZhyIi8VYlQMRZlVfKGHqkRORpoglXuPckdb673bdjxV/QL81lxVjUou7OMGCvnwFR Bi8TWLG/UPhALfx91G+LOqGl6X7w6Yr+MNll2MpT5hRzICjxoatB3ONPrOWVrkog7M7z ms1Q== X-Gm-Message-State: AOAM530iM+yYCpLITtchaw9xiPNcdxdO8bua/3q0BNfPZI3cRiatCstB H1aOfYmczK4p+pY3MErLAxAkkEUKQg1scTgCMFpEK+Roh0Eb4vOm7VRnhX6Z9lYLsxLMqWmPuUp y27PsIdCHaUEgTkfxnXg3EPqlC5Qu6AOuOs81GET+1u6ulyL5p9Xlm9KV6YaTzGg= X-Google-Smtp-Source: ABdhPJw0RJFyrFkK7ng+jsERmBVKHI5PtMqMrFdnDl16zcZCtjsaoeUX5oPL6ml0D3aDgc7WYiiU2zkeJ9IQ3w== X-Received: from chooglen.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:26d9]) (user=chooglen job=sendgmr) by 2002:a17:902:9882:b0:13e:1749:daae with SMTP id s2-20020a170902988200b0013e1749daaemr2343207plp.60.1633393195354; Mon, 04 Oct 2021 17:19:55 -0700 (PDT) Date: Mon, 4 Oct 2021 17:19:31 -0700 In-Reply-To: <20211005001931.13932-1-chooglen@google.com> Message-Id: <20211005001931.13932-4-chooglen@google.com> Mime-Version: 1.0 References: <20210917225459.68086-1-chooglen@google.com> <20211005001931.13932-1-chooglen@google.com> X-Mailer: git-send-email 2.33.0.800.g4c38ced690-goog Subject: [PATCH v3 3/3] gc: perform incremental repack when implictly enabled From: Glen Choo To: git@vger.kernel.org Cc: Eric Sunshine , Taylor Blau , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org builtin/gc.c has two ways of checking if multi-pack-index is enabled: - git_config_get_bool() in incremental_repack_auto_condition() - the_repository->settings.core_multi_pack_index in maintenance_task_incremental_repack() The two implementations have existed since the incremental-repack task was introduced in e841a79a13 (maintenance: add incremental-repack auto condition, 2020-09-25). These two values can diverge because prepare_repo_settings() enables the feature in the_repository->settings by default. In the case where core.multiPackIndex is not set in the config, the auto condition would fail, causing the incremental-repack task to not be run. Because we always want to consider the default values, we should always use the_repository->settings. Standardize on using the_repository->settings.core_multi_pack_index to check if multi-pack-index is enabled. Signed-off-by: Glen Choo --- builtin/gc.c | 5 ++--- t/t7900-maintenance.sh | 28 ++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/builtin/gc.c b/builtin/gc.c index f05d2f0a1a..070b7dccb1 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -1051,12 +1051,11 @@ static int maintenance_task_loose_objects(struct maintenance_run_opts *opts) static int incremental_repack_auto_condition(void) { struct packed_git *p; - int enabled; int incremental_repack_auto_limit = 10; int count = 0; - if (git_config_get_bool("core.multiPackIndex", &enabled) || - !enabled) + prepare_repo_settings(the_repository); + if (!the_repository->settings.core_multi_pack_index) return 0; git_config_get_int("maintenance.incremental-repack.auto", diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index 58f46c77e6..7b1b2581af 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -321,15 +321,15 @@ test_expect_success EXPENSIVE 'incremental-repack 2g limit' ' --no-progress --batch-size=2147483647 /dev/null && test_subcommand ! git multi-pack-index write --no-progress /dev/null && test_subcommand ! git multi-pack-index write --no-progress /dev/null && test_subcommand git multi-pack-index write --no-progress