summary refs log tree commit diff
path: root/fetch-pack.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-24 11:24:22 +0900
committerJunio C Hamano <gitster@pobox.com>2018-04-24 11:24:22 +0900
commitbbc39d4020372a0bf8aa399c7550ba58312adfa1 (patch)
treecd73306b4e1965ede84e883816b9aac6de42d105 /fetch-pack.h
parentfe0a9eaf31dd0c349ae4308498c33a5c3794b293 (diff)
parenta4d78ce26bf4816d868be21c7355d0e0940460a7 (diff)
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 'fetch-pack.h')
-rw-r--r--fetch-pack.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/fetch-pack.h b/fetch-pack.h
index 3e224a1822..6afa08b48b 100644
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -3,6 +3,7 @@
 
 #include "string-list.h"
 #include "run-command.h"
+#include "protocol.h"
 #include "list-objects-filter-options.h"
 
 struct oid_array;
@@ -53,7 +54,8 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
 		       struct ref **sought,
 		       int nr_sought,
 		       struct oid_array *shallow,
-		       char **pack_lockfile);
+		       char **pack_lockfile,
+		       enum protocol_version version);
 
 /*
  * Print an appropriate error message for each sought ref that wasn't