diff options
Diffstat (limited to 'transport.h')
| -rw-r--r-- | transport.h | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/transport.h b/transport.h index 97707774e7..6fe3485325 100644 --- a/transport.h +++ b/transport.h @@ -12,13 +12,18 @@ struct git_transport_options { unsigned check_self_contained_and_connected : 1; unsigned self_contained_and_connected : 1; unsigned update_shallow : 1; - unsigned push_cert : 1; int depth; const char *uploadpack; const char *receivepack; struct push_cas_option *cas; }; +enum transport_family { + TRANSPORT_FAMILY_ALL = 0, + TRANSPORT_FAMILY_IPV4, + TRANSPORT_FAMILY_IPV6 +}; + struct transport { struct remote *remote; const char *url; @@ -43,6 +48,12 @@ struct transport { */ unsigned cloning : 1; + /* + * These strings will be passed to the {pre, post}-receive hook, + * on the remote side, if both sides support the push options capability. + */ + const struct string_list *push_options; + /** * Returns 0 if successful, positive if the option is not * recognized or is inapplicable, and negative if the option @@ -75,15 +86,15 @@ struct transport { /** * Push the objects and refs. Send the necessary objects, and * then, for any refs where peer_ref is set and - * peer_ref->new_sha1 is different from old_sha1, tell the - * remote side to update each ref in the list from old_sha1 to - * peer_ref->new_sha1. + * peer_ref->new_oid is different from old_oid, tell the + * remote side to update each ref in the list from old_oid to + * peer_ref->new_oid. * * Where possible, set the status for each ref appropriately. * * The transport must modify new_sha1 in the ref to the new * value if the remote accepted the change. Note that this - * could be a different value from peer_ref->new_sha1 if the + * could be a different value from peer_ref->new_oid if the * process involved generating new commits. **/ int (*push_refs)(struct transport *transport, struct ref *refs, int flags); @@ -111,6 +122,8 @@ struct transport { * actually turns out to be smart. */ struct git_transport_options *smart_options; + + enum transport_family family; }; #define TRANSPORT_PUSH_ALL 1 @@ -124,8 +137,10 @@ struct transport { #define TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND 256 #define TRANSPORT_PUSH_NO_HOOK 512 #define TRANSPORT_PUSH_FOLLOW_TAGS 1024 -#define TRANSPORT_PUSH_CERT 2048 -#define TRANSPORT_PUSH_ATOMIC 4096 +#define TRANSPORT_PUSH_CERT_ALWAYS 2048 +#define TRANSPORT_PUSH_CERT_IF_ASKED 4096 +#define TRANSPORT_PUSH_ATOMIC 8192 +#define TRANSPORT_PUSH_OPTIONS 16384 #define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3) #define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x) |