X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache.h;h=10afd71d435920a3cc2152208a06058791ea7a04;hb=1c719ffc3d1c4e03313d5cf5c4d32ec763697857;hp=af203fcab0821d667e58fd30eceb5b0be43bf507;hpb=2e05710a161e6287f239fae42b86b0cb46190834;p=git.git diff --git a/cache.h b/cache.h index af203fcab..10afd71d4 100644 --- a/cache.h +++ b/cache.h @@ -833,9 +833,9 @@ static inline int get_sha1_with_context(const char *str, unsigned char *sha1, st extern int get_sha1_hex(const char *hex, unsigned char *sha1); extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */ -extern int read_ref_full(const char *filename, unsigned char *sha1, +extern int read_ref_full(const char *refname, unsigned char *sha1, int reading, int *flags); -extern int read_ref(const char *filename, unsigned char *sha1); +extern int read_ref(const char *refname, unsigned char *sha1); /* * Resolve a reference, recursively following symbolic refererences. @@ -1028,16 +1028,14 @@ struct ref { extern struct ref *find_ref_by_name(const struct ref *list, const char *name); #define CONNECT_VERBOSE (1u << 0) -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);