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 <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Oct 12, 2020 at 13:28 UTC
d334107c5da27e5212e21e77da03e938ea6db976
2 files changed
+12
builtin/gc.c
+4
@@ -813,6 +813,10 @@ static int run_write_commit_graph(struct maintenance_run_opts *opts)
813
814
static int maintenance_task_commit_graph(struct maintenance_run_opts *opts)
815
{
816
+ prepare_repo_settings(the_repository);
817
+ if (!the_repository->settings.core_commit_graph)
818
+ return 0;
819
+
820
close_object_store(the_repository->objects);
821
if (run_write_commit_graph(opts)) {
822
error(_("failed to write commit-graph"));
t/t7900-maintenance.sh
+8
@@ -52,6 +52,14 @@ test_expect_success 'run --task=<task>' '
52
test_subcommand git commit-graph write --split --reachable --no-progress <run-both.txt
53
'
54
55
+test_expect_success 'core.commitGraph=false prevents write process' '
56
+ GIT_TRACE2_EVENT="$(pwd)/no-commit-graph.txt" \
57
+ git -c core.commitGraph=false maintenance run \
58
+ --task=commit-graph 2>/dev/null &&
59
+ test_subcommand ! git commit-graph write --split --reachable --no-progress \
60
+ <no-commit-graph.txt
61
+'
62
+
63
test_expect_success 'commit-graph auto condition' '
64
COMMAND="maintenance run --task=commit-graph --auto --quiet" &&
65