X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=c7c6637b1ff0135281cabd800efbbf38ee72d627;hb=3d32051f4fd657747de00cb9d516dc3512bb377d;hp=f1d15ab3c9f1006f99c9852b2ce1d1209d986064;hpb=f51248eb482a7a0feacb04d02119c94d35845975;p=git.git diff --git a/cache.h b/cache.h index f1d15ab3..c7c6637b 100644 --- a/cache.h +++ b/cache.h @@ -179,6 +179,8 @@ extern int commit_index_file(struct cache_file *); extern void rollback_index_file(struct cache_file *); extern int trust_executable_bit; +extern int only_use_symrefs; +extern int diff_rename_limit_default; #define MTIME_CHANGED 0x0001 #define CTIME_CHANGED 0x0002 @@ -201,6 +203,7 @@ int git_mkstemp(char *path, size_t n, const char *template); int safe_create_leading_directories(char *path); char *safe_strncpy(char *, const char *, size_t); +char *enter_repo(char *path, int strict); /* Read and unpack a sha1 file into memory, write memory to a sha1 file */ extern int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size); @@ -257,6 +260,7 @@ extern void *read_object_with_reference(const unsigned char *sha1, const char *show_date(unsigned long time, int timezone); int parse_date(const char *date, char *buf, int bufsize); void datestamp(char *buf, int bufsize); +unsigned long approxidate(const char *); extern int setup_ident(void); extern char *get_ident(const char *name, const char *email, const char *date_str); @@ -339,7 +343,8 @@ extern int path_match(const char *path, int nr, char **match); extern int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail, int nr_refspec, char **refspec, int all); extern int get_ack(int fd, unsigned char *result_sha1); -extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match); +extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, int ignore_funny); +extern int server_supports(const char *feature); extern struct packed_git *parse_pack_index(unsigned char *sha1); extern struct packed_git *parse_pack_index_file(const unsigned char *sha1, @@ -382,6 +387,8 @@ extern int git_default_config(const char *, const char *); extern int git_config(config_fn_t fn); extern int git_config_int(const char *, const char *); extern int git_config_bool(const char *, const char *); +extern int git_config_set(const char *, const char *); +extern int git_config_set_multivar(const char *, const char *, const char *, int); #define MAX_GITNAME (1000) extern char git_default_email[MAX_GITNAME]; @@ -413,4 +420,5 @@ static inline int sane_case(int x, int high) return x; } +extern int copy_fd(int ifd, int ofd); #endif /* CACHE_H */