diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:41 -0700 |
| commit | af8ac73801eebf0f3690c3875751eb9e108ceda8 (patch) | |
| tree | 249972b860396750d38bca79bb0e15c001bbcf8c /object.h | |
| parent | Merge branch 'ab/checkout-default-remote' (diff) | |
| parent | fetch-pack: introduce negotiator API (diff) | |
| download | git-af8ac73801eebf0f3690c3875751eb9e108ceda8.tar.gz git-af8ac73801eebf0f3690c3875751eb9e108ceda8.zip | |
Merge branch 'jt/fetch-pack-negotiator'
Code restructuring and a small fix to transport protocol v2 during
fetching.
* jt/fetch-pack-negotiator:
fetch-pack: introduce negotiator API
fetch-pack: move common check and marking together
fetch-pack: make negotiation-related vars local
fetch-pack: use ref adv. to prune "have" sent
fetch-pack: directly end negotiation if ACK ready
fetch-pack: clear marks before re-marking
fetch-pack: split up everything_local()
Diffstat (limited to 'object.h')
| -rw-r--r-- | object.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -54,7 +54,8 @@ struct object_array { /* * object flag allocation: * revision.h: 0---------10 2526 - * fetch-pack.c: 0----5 + * fetch-pack.c: 01 + * negotiator/default.c: 2--5 * walker.c: 0-2 * upload-pack.c: 4 11----------------19 * builtin/blame.c: 12-13 |