aboutsummaryrefslogtreecommitdiffstats
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-17 17:21:40 -0800
committerJunio C Hamano <gitster@pobox.com>2021-02-17 17:21:40 -0800
commit8b4701ae4fa8e68362509013ceb496333b7ca0df (patch)
tree3f34f7368739f10ec4c776d6b2a8d7345479c8d6 /commit.h
parent328c10930387d301560f7cbcd3351cc485a13381 (diff)
parent5a3b130cad0d5c770f766e3af6d32b41766374c0 (diff)
downloadgit-8b4701ae4fa8e68362509013ceb496333b7ca0df.tar.gz
Merge branch 'ak/corrected-commit-date'
The commit-graph learned to use corrected commit dates instead of the generation number to help topological revision traversal. * ak/corrected-commit-date: doc: add corrected commit date info commit-reach: use corrected commit dates in paint_down_to_common() commit-graph: use generation v2 only if entire chain does commit-graph: implement generation data chunk commit-graph: implement corrected commit date commit-graph: return 64-bit generation number commit-graph: add a slab to store topological levels t6600-test-reach: generalize *_three_modes commit-graph: consolidate fill_commit_graph_info revision: parse parent in indegree_walk_step() commit-graph: fix regression when computing Bloom filters
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/commit.h b/commit.h
index ecacf9ade3..0c9714827c 100644
--- a/commit.h
+++ b/commit.h
@@ -11,9 +11,10 @@
#include "commit-slab.h"
#define COMMIT_NOT_FROM_GRAPH 0xFFFFFFFF
-#define GENERATION_NUMBER_INFINITY 0xFFFFFFFF
-#define GENERATION_NUMBER_MAX 0x3FFFFFFF
+#define GENERATION_NUMBER_INFINITY ((1ULL << 63) - 1)
+#define GENERATION_NUMBER_V1_MAX 0x3FFFFFFF
#define GENERATION_NUMBER_ZERO 0
+#define GENERATION_NUMBER_V2_OFFSET_MAX ((1ULL << 31) - 1)
struct commit_list {
struct commit *item;