X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=remote.h;h=5a5919825285745ff11f5a8f7248ebaaddd0560a;hb=608cc4f2738d5e2055e238b2a9e482180d948a05;hp=3211abdf05ceef275309053af0dafc06f51fbb13;hpb=a08832f16e56207b2967b51c236f24e180a70107;p=thirdparty%2Fgit.git diff --git a/remote.h b/remote.h index 3211abdf05..5a59198252 100644 --- a/remote.h +++ b/remote.h @@ -6,6 +6,8 @@ #include "hashmap.h" #include "refspec.h" +struct transport_ls_refs_options; + /** * The API gives access to the configuration related to remotes. It handles * all three configuration mechanisms historically and currently used by Git, @@ -134,7 +136,7 @@ struct ref { * should be 0, so that xcalloc'd structures get it * by default. */ - enum { + enum fetch_head_status { FETCH_HEAD_MERGE = -1, FETCH_HEAD_NOT_FOR_MERGE = 0, FETCH_HEAD_IGNORE = 1 @@ -196,7 +198,7 @@ struct ref **get_remote_heads(struct packet_reader *reader, /* Used for protocol v2 in order to retrieve refs from a remote */ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, struct ref **list, int for_push, - const struct strvec *ref_prefixes, + struct transport_ls_refs_options *transport_options, const struct string_list *server_options, int stateless_rpc);