summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-19 16:05:55 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-19 16:05:55 -0800
commitb3ae9d8e57166c771926e3f55555bf248b71202a (patch)
tree358559721eb8de383691b33f4ff54ff7454d981a /cache.h
parent2e05710a161e6287f239fae42b86b0cb46190834 (diff)
parentbab8d28e774c255a326ad5592af6351e4925efcb (diff)
downloadgit-b3ae9d8e57166c771926e3f55555bf248b71202a.tar.gz
Merge branch 'jk/fetch-no-tail-match-refs'
* jk/fetch-no-tail-match-refs: connect.c: drop path_match function fetch-pack: match refs exactly t5500: give fully-qualified refs to fetch-pack drop "match" parameter from get_remote_heads
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index af203fcab0..7d93df61c3 100644
--- a/cache.h
+++ b/cache.h
@@ -1032,12 +1032,11 @@ extern char *git_getpass(const char *prompt);
extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);
extern int finish_connect(struct child_process *conn);
extern int git_connection_is_socket(struct child_process *conn);
-extern int path_match(const char *path, int nr, char **match);
struct extra_have_objects {
int nr, alloc;
unsigned char (*array)[20];
};
-extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, unsigned int flags, 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 struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);