summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-29 13:18:50 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-29 13:18:50 -0800
commit7b718fbf17f5b51887d420e6edc9dcb7b0c0f83c (patch)
tree4eb9885e931f18d6dfb9c3c6dc5484a0b60d1250 /cache.h
parent7859f533e2247f21cdf3fa74e78b600c9ec62270 (diff)
parentd336572f57e398318a0f6c51cc760d5be9872cc2 (diff)
downloadgit-7b718fbf17f5b51887d420e6edc9dcb7b0c0f83c.tar.gz
Merge branch 'cb/push-quiet'
* cb/push-quiet: t5541: avoid TAP test miscounting fix push --quiet: add 'quiet' capability to receive-pack server_supports(): parse feature list more carefully
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 10afd71d43..9bd8c2d06c 100644
--- a/cache.h
+++ b/cache.h
@@ -1037,6 +1037,7 @@ 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 struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);