summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-18 01:21:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-02-18 01:21:40 (GMT)
commit8b4701ae4fa8e68362509013ceb496333b7ca0df (patch)
tree3f34f7368739f10ec4c776d6b2a8d7345479c8d6 /upload-pack.c
parent328c10930387d301560f7cbcd3351cc485a13381 (diff)
parent5a3b130cad0d5c770f766e3af6d32b41766374c0 (diff)
downloadgit-8b4701ae4fa8e68362509013ceb496333b7ca0df.zip
git-8b4701ae4fa8e68362509013ceb496333b7ca0df.tar.gz
git-8b4701ae4fa8e68362509013ceb496333b7ca0df.tar.bz2
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 'upload-pack.c')
-rw-r--r--upload-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c
index abadc93..e19583a 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -493,7 +493,7 @@ static int got_oid(struct upload_pack_data *data,
static int ok_to_give_up(struct upload_pack_data *data)
{
- uint32_t min_generation = GENERATION_NUMBER_ZERO;
+ timestamp_t min_generation = GENERATION_NUMBER_ZERO;
if (!data->have_obj.nr)
return 0;