summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-24 11:24:22 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-24 11:24:22 +0900
commitbbc39d4020372a0bf8aa399c7550ba58312adfa1 (patch)
treecd73306b4e1965ede84e883816b9aac6de42d105 /remote.h
parentMerge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn (diff)
parentremote-curl: don't request v2 when pushing (diff)
downloadtgif-bbc39d4020372a0bf8aa399c7550ba58312adfa1.tar.xz
Merge branch 'bw/protocol-v2' into HEAD
* bw/protocol-v2: (35 commits) remote-curl: don't request v2 when pushing remote-curl: implement stateless-connect command http: eliminate "# service" line when using protocol v2 http: don't always add Git-Protocol header http: allow providing extra headers for http requests remote-curl: store the protocol version the server responded with remote-curl: create copy of the service name pkt-line: add packet_buf_write_len function transport-helper: introduce stateless-connect transport-helper: refactor process_connect_service transport-helper: remove name parameter connect: don't request v2 when pushing connect: refactor git_connect to only get the protocol version once fetch-pack: support shallow requests fetch-pack: perform a fetch using v2 upload-pack: introduce fetch server command push: pass ref prefixes when pushing fetch: pass ref prefixes when fetching ls-remote: pass ref prefixes when requesting a remote's refs transport: convert transport_get_remote_refs to take a list of ref prefixes ...
Diffstat (limited to 'remote.h')
-rw-r--r--remote.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/remote.h b/remote.h
index f09c01969d..2b3180f94d 100644
--- a/remote.h
+++ b/remote.h
@@ -151,10 +151,17 @@ int check_ref_type(const struct ref *ref, int flags);
void free_refs(struct ref *ref);
struct oid_array;
-extern struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
+struct packet_reader;
+struct argv_array;
+extern struct ref **get_remote_heads(struct packet_reader *reader,
struct ref **list, unsigned int flags,
struct oid_array *extra_have,
- struct oid_array *shallow);
+ struct oid_array *shallow_points);
+
+/* Used for protocol v2 in order to retrieve refs from a remote */
+extern struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
+ struct ref **list, int for_push,
+ const struct argv_array *ref_prefixes);
int resolve_remote_symref(struct ref *ref, struct ref *list);
int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid);