summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-19 18:30:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-19 18:30:20 (GMT)
commit92b1ea66b9a8f012a343ebc157c3441154e831f0 (patch)
tree7e1888fe1701819fb8130bce911c27b3ae6cd02c /builtin/gc.c
parent209f0755934a0c9b448408f9b7c9849c15041ecc (diff)
parent5b15eb397d176c557a82e872d6b4043aa7589874 (diff)
downloadgit-92b1ea66b9a8f012a343ebc157c3441154e831f0.zip
git-92b1ea66b9a8f012a343ebc157c3441154e831f0.tar.gz
git-92b1ea66b9a8f012a343ebc157c3441154e831f0.tar.bz2
Merge branch 'ds/commit-graph-incremental'
The commits in a repository can be described by multiple commit-graph files now, which allows the commit-graph files to be updated incrementally. * ds/commit-graph-incremental: commit-graph: test verify across alternates commit-graph: normalize commit-graph filenames commit-graph: test --split across alternate without --split commit-graph: test octopus merges with --split commit-graph: clean up chains after flattened write commit-graph: verify chains with --shallow mode commit-graph: create options for split files commit-graph: expire commit-graph files commit-graph: allow cross-alternate chains commit-graph: merge commit-graph chains commit-graph: add --split option to builtin commit-graph: write commit-graph chains commit-graph: rearrange chunk count logic commit-graph: add base graphs chunk commit-graph: load commit-graph chains commit-graph: rename commit_compare to oid_compare commit-graph: prepare for commit-graph chains commit-graph: document commit-graph chains
Diffstat (limited to 'builtin/gc.c')
-rw-r--r--builtin/gc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index be8e0bf..c18efad 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -687,7 +687,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
if (gc_write_commit_graph &&
write_commit_graph_reachable(get_object_directory(),
- !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0))
+ !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0,
+ NULL))
return 1;
if (auto_gc && too_many_loose_objects())