aboutsummaryrefslogtreecommitdiffstats
path: root/object.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-18 18:23:52 +0900
committerJunio C Hamano <gitster@pobox.com>2018-11-18 18:23:52 +0900
commit62ca33e02a4ea93dd59538ac986a082430253b27 (patch)
treeb5f5af9c87a64536f0e7ada9e0066e4f5d29af4e /object.h
parentTenth batch for 2.20 (diff)
parentt6012: make rev-list tests more interesting (diff)
downloadgit-62ca33e02a4ea93dd59538ac986a082430253b27.tar.gz
git-62ca33e02a4ea93dd59538ac986a082430253b27.zip
Merge branch 'ds/reachable-topo-order'
The revision walker machinery learned to take advantage of the commit generation numbers stored in the commit-graph file. * ds/reachable-topo-order: t6012: make rev-list tests more interesting revision.c: generation-based topo-order algorithm commit/revisions: bookkeeping before refactoring revision.c: begin refactoring --topo-order logic test-reach: add rev-list tests test-reach: add run_three_modes method prio-queue: add 'peek' operation
Diffstat (limited to 'object.h')
-rw-r--r--object.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/object.h b/object.h
index 0feb90ae61..796792cb32 100644
--- a/object.h
+++ b/object.h
@@ -59,7 +59,7 @@ struct object_array {
/*
* object flag allocation:
- * revision.h: 0---------10 2526
+ * revision.h: 0---------10 25----28
* fetch-pack.c: 01
* negotiator/default.c: 2--5
* walker.c: 0-2
@@ -78,7 +78,7 @@ struct object_array {
* builtin/show-branch.c: 0-------------------------------------------26
* builtin/unpack-objects.c: 2021
*/
-#define FLAG_BITS 27
+#define FLAG_BITS 29
/*
* The object type is stored in 3 bits.