From d334107c5da27e5212e21e77da03e938ea6db976 Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Mon, 12 Oct 2020 13:28:34 +0000 Subject: [PATCH] maintenance: core.commitGraph=false prevents writes Recently, a user had an issue due to combining fetch.writeCommitGraph=true with core.commitGraph=false. The root bug has been resolved by preventing commit-graph writes when core.commitGraph is disabled. This happens inside the 'git commit-graph write' command, but we can be more aware of this situation and prevent that process from ever starting in the 'commit-graph' maintenance task. Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano --- builtin/gc.c | 4 ++++ t/t7900-maintenance.sh | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/builtin/gc.c b/builtin/gc.c index 12ddb68bba..e80331c4e2 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -813,6 +813,10 @@ static int run_write_commit_graph(struct maintenance_run_opts *opts) static int maintenance_task_commit_graph(struct maintenance_run_opts *opts) { + prepare_repo_settings(the_repository); + if (!the_repository->settings.core_commit_graph) + return 0; + close_object_store(the_repository->objects); if (run_write_commit_graph(opts)) { error(_("failed to write commit-graph")); diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh index ee1f4a7ae4..9776154a2a 100755 --- a/t/t7900-maintenance.sh +++ b/t/t7900-maintenance.sh @@ -52,6 +52,14 @@ test_expect_success 'run --task=' ' test_subcommand git commit-graph write --split --reachable --no-progress /dev/null && + test_subcommand ! git commit-graph write --split --reachable --no-progress \ +