summaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-05-16 12:05:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-05-16 12:05:22 (GMT)
commit644f4a20468da89c1325a539c0521336f7835a64 (patch)
tree39ccb6b55222d659ab3d63d8b91e8ba549c360e5 /object.h
parent97eea85a0a1ec66d356567808a1e4ca2367e0ce7 (diff)
parent477673d6f39b4829baa98ad88d6b65b35b79fd0f (diff)
downloadgit-644f4a20468da89c1325a539c0521336f7835a64.zip
git-644f4a20468da89c1325a539c0521336f7835a64.tar.gz
git-644f4a20468da89c1325a539c0521336f7835a64.tar.bz2
Merge branch 'jt/push-negotiation'
"git push" learns to discover common ancestor with the receiving end over protocol v2. * jt/push-negotiation: send-pack: support push negotiation fetch: teach independent negotiation (no packfile) fetch-pack: refactor command and capability write fetch-pack: refactor add_haves() fetch-pack: refactor process_acks()
Diffstat (limited to 'object.h')
-rw-r--r--object.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/object.h b/object.h
index 87a6da4..8bca310 100644
--- a/object.h
+++ b/object.h
@@ -60,7 +60,7 @@ struct object_array {
/*
* object flag allocation:
* revision.h: 0---------10 15 23------26
- * fetch-pack.c: 01
+ * fetch-pack.c: 01 67
* negotiator/default.c: 2--5
* walker.c: 0-2
* upload-pack.c: 4 11-----14 16-----19