diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:06:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:06:45 -0700 |
| commit | 59d7cbd343d098783f8a91fb67d90ac3d066ea77 (patch) | |
| tree | f3655aec189b8c190b366c7616632cb7e83454b9 /cache.h | |
| parent | Merge branch 'jc/doc-git-updates' into maint (diff) | |
| parent | fetch-pack: mention server version with verbose output (diff) | |
| download | tgif-59d7cbd343d098783f8a91fb67d90ac3d066ea77.tar.xz | |
Merge branch 'jc/capabilities' into maint
* jc/capabilities:
fetch-pack: mention server version with verbose output
parse_feature_request: make it easier to see feature values
fetch-pack: do not ask for unadvertised capabilities
do not send client agent unless server does first
send-pack: fix capability-sending logic
include agent identifier in capability string
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1038,7 +1038,9 @@ struct extra_have_objects { }; extern struct ref **get_remote_heads(int in, struct ref **list, unsigned int flags, struct extra_have_objects *); extern int server_supports(const char *feature); -extern const char *parse_feature_request(const char *features, const char *feature); +extern int parse_feature_request(const char *features, const char *feature); +extern const char *server_feature_value(const char *feature, int *len_ret); +extern const char *parse_feature_value(const char *feature_list, const char *feature, int *len_ret); extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path); |