From patchwork Wed Jul 1 13:27:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11636371 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 597ED13B4 for ; Wed, 1 Jul 2020 13:27:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 40B34207F5 for ; Wed, 1 Jul 2020 13:27:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n+2lBX8Y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730930AbgGAN1g (ORCPT ); Wed, 1 Jul 2020 09:27:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730729AbgGAN1f (ORCPT ); Wed, 1 Jul 2020 09:27:35 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFCDEC08C5C1 for ; Wed, 1 Jul 2020 06:27:34 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id f18so23259471wml.3 for ; Wed, 01 Jul 2020 06:27:34 -0700 (PDT) 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=UiCtqTJGVEULmS7sPq1CCgWHFh2xZ9/Kbd4Wgi4nLYI=; b=n+2lBX8YWZ8dIuvSkUm97QgrOTxpDvFKgtou6UVeqGTD4MZS45SGRpyB9ocUcOyU4S zQXMCAUhv3Om7lYllcQmtsKaafnDozYWgizzMsvqlITV/GRZ5UxoPh6ueJRmfeI7eVRA UzpvM+pkcEV7fYpB3w3XImAYOuus4AgAghR8g297ecOEFjz5WzB9/sAS1/ip2PQ0azlU 3lqm+RLgE+7HJopkeanHNt8CSSSW7d0D4yGJnJKKZ2s3mOg8Qm/o9FCQmIEnMhMAdO+g tV9vpxzZfcAyHvRoXr92iKg3GJZvj2kRGyjBwXv/BzaBKkCofwW4Tpnc9eBeDJqEVlmM tfIw== 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=UiCtqTJGVEULmS7sPq1CCgWHFh2xZ9/Kbd4Wgi4nLYI=; b=aTS132QF6wdiCe31o3ED9XZpljmG5tqdYsws3u88tk/XM6wBo9scmRrlJxCnI6Pqhb +ZzVZvKcLuyuFZ5YTjWHD2He1nzaNohgSiEtgPJNNrUreTrZWUH6IKeaiidMNYCJCbSO 3Wsl1uDwvdTyDkp8H7FeJYCIArRbdYJAFLODflQ6mWidY8PHIrT59jiWe/zLhQnMyePJ K4Vyt8jTWfIO2Z+JAS7cySpqmy6+/UvElP3ER4ebjGX9GEfB0476p5mqXcrP7AbJPwba ocsXyD8RhTfa00+DPPB8IIPPEsKT5/EHNSUYeByfDrfpfEgMhoVj+8yiqHinLmA7TBnx wZ4g== X-Gm-Message-State: AOAM533R3aNSZV+TPz6HtVpUDN9sb1FUXS9IqzBxT3/fjZHphNWz+rUN 25MZluCfLcXgHpk8uyB81CjHddAv X-Google-Smtp-Source: ABdhPJwEd/iwCw61522g8qsYx3XO186NRbvqbXwbkjCCrI+TyHPKEgbLGKaSfDT6Pun8xaiTxAtJkQ== X-Received: by 2002:a1c:a70d:: with SMTP id q13mr24808353wme.55.1593610053545; Wed, 01 Jul 2020 06:27:33 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y6sm7601763wmy.0.2020.07.01.06.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:27:33 -0700 (PDT) Message-Id: <6b63f9bd8a2a7e18d7ac1be7066d4bcd1df2a729.1593610050.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Date: Wed, 01 Jul 2020 13:27:22 +0000 Subject: [PATCH v4 02/10] commit-graph: change test to die on parse, not load Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: me@ttaylorr.com, szeder.dev@gmail.com, l.s.r@web.de, Derrick Stolee , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee 43d3561 (commit-graph write: don't die if the existing graph is corrupt, 2019-03-25) introduced the GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD environment variable. This was created to verify that commit-graph was not loaded when writing a new non-incremental commit-graph. An upcoming change wants to load a commit-graph in some valuable cases, but we want to maintain that we don't trust the commit-graph data when writing our new file. Instead of dying on load, instead die if we ever try to parse a commit from the commit-graph. This functionally verifies the same intended behavior, but allows a more advanced feature in the next change. Signed-off-by: Derrick Stolee --- commit-graph.c | 12 ++++++++---- commit-graph.h | 2 +- t/t5318-commit-graph.sh | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/commit-graph.c b/commit-graph.c index d0fedcd9b1..6a28d4a5a6 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -564,10 +564,6 @@ static int prepare_commit_graph(struct repository *r) return !!r->objects->commit_graph; r->objects->commit_graph_attempted = 1; - if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0)) - die("dying as requested by the '%s' variable on commit-graph load!", - GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD); - prepare_repo_settings(r); if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && @@ -790,6 +786,14 @@ static int parse_commit_in_graph_one(struct repository *r, int parse_commit_in_graph(struct repository *r, struct commit *item) { + static int checked_env = 0; + + if (!checked_env && + git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE, 0)) + die("dying as requested by the '%s' variable on commit-graph parse!", + GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE); + checked_env = 1; + if (!prepare_commit_graph(r)) return 0; return parse_commit_in_graph_one(r, r->objects->commit_graph, item); diff --git a/commit-graph.h b/commit-graph.h index 881c9b46e5..f0fb13e3f2 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -5,7 +5,7 @@ #include "object-store.h" #define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH" -#define GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD "GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD" +#define GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE "GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE" #define GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS "GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS" /* diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index 1073f9e3cf..5ec01abdaa 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -436,7 +436,7 @@ corrupt_graph_verify() { cp $objdir/info/commit-graph commit-graph-pre-write-test fi && git status --short && - GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD=true git commit-graph write && + GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE=true git commit-graph write && git commit-graph verify }