diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-06-25 12:27:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-25 12:27:47 -0700 |
| commit | 34e849b05a454a2c6487f8fbfa68c39932d22730 (patch) | |
| tree | 7a71a357e9f7e2c977849224ca18b2cb9a4461ea /fetch-pack.h | |
| parent | Merge branch 'ss/submodule-set-branch-in-c' (diff) | |
| parent | upload-pack: fix a sparse '0 as NULL pointer' warning (diff) | |
| download | git-34e849b05a454a2c6487f8fbfa68c39932d22730.tar.gz git-34e849b05a454a2c6487f8fbfa68c39932d22730.zip | |
Merge branch 'jt/cdn-offload'
The "fetch/clone" protocol has been updated to allow the server to
instruct the clients to grab pre-packaged packfile(s) in addition
to the packed object data coming over the wire.
* jt/cdn-offload:
upload-pack: fix a sparse '0 as NULL pointer' warning
upload-pack: send part of packfile response as uri
fetch-pack: support more than one pack lockfile
upload-pack: refactor reading of pack-objects out
Documentation: add Packfile URIs design doc
Documentation: order protocol v2 sections
http-fetch: support fetching packfiles by URL
http-fetch: refactor into function
http: refactor finish_http_pack_request()
http: use --stdin when indexing dumb HTTP pack
Diffstat (limited to 'fetch-pack.h')
| -rw-r--r-- | fetch-pack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fetch-pack.h b/fetch-pack.h index 67f684229a..85d1e39fe7 100644 --- a/fetch-pack.h +++ b/fetch-pack.h @@ -83,7 +83,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args, struct ref **sought, int nr_sought, struct oid_array *shallow, - char **pack_lockfile, + struct string_list *pack_lockfiles, enum protocol_version version); /* |