diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-16 12:05:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-16 12:05:22 (GMT) |
| commit | 644f4a20468da89c1325a539c0521336f7835a64 (patch) | |
| tree | 39ccb6b55222d659ab3d63d8b91e8ba549c360e5 /transport.h | |
| parent | 97eea85a0a1ec66d356567808a1e4ca2367e0ce7 (diff) | |
| parent | 477673d6f39b4829baa98ad88d6b65b35b79fd0f (diff) | |
| download | git-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 'transport.h')
| -rw-r--r-- | transport.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/transport.h b/transport.h index 4d5db0a..1cbab11 100644 --- a/transport.h +++ b/transport.h @@ -47,6 +47,12 @@ struct git_transport_options { * transport_set_option(). */ struct oid_array *negotiation_tips; + + /* + * If allocated, whenever transport_fetch_refs() is called, add known + * common commits to this oidset instead of fetching any packfiles. + */ + struct oidset *acked_commits; }; enum transport_family { |