diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:32:36 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:32:36 -0800 |
commit | 7a5638a1597da222dde484074392223d8daebd15 (patch) | |
tree | 66221490fd990d15dbbf3f19b9095004e025ff04 /cache.h | |
parent | Merge branch 'ew/keepalive' into maint (diff) | |
parent | connect.c: drop path_match function (diff) | |
download | tgif-7a5638a1597da222dde484074392223d8daebd15.tar.xz |
Merge branch 'jk/fetch-no-tail-match-refs' into maint
* 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.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1028,12 +1028,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); |