X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=cache.h;h=84d43d366c6145a30865aa65d92ada88ab95bb9f;hb=167a4a3308f4a1606e268c2204c98d6999046ae0;hp=c79c70f713b16975c0622eb69d4a172cc73307ba;hpb=f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba;p=git.git diff --git a/cache.h b/cache.h index c79c70f7..84d43d36 100644 --- a/cache.h +++ b/cache.h @@ -138,7 +138,7 @@ extern int remove_cache_entry_at(int pos); extern int remove_file_from_cache(char *path); extern int ce_same_name(struct cache_entry *a, struct cache_entry *b); extern int ce_match_stat(struct cache_entry *ce, struct stat *st); -extern int index_fd(unsigned char *sha1, int fd, struct stat *st); +extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, const char *type); extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); struct cache_file { @@ -158,8 +158,12 @@ extern void rollback_index_file(struct cache_file *); #define TYPE_CHANGED 0x0040 /* Return a statically allocated filename matching the sha1 signature */ +extern char *mkpath(const char *fmt, ...); +extern char *git_path(const char *fmt, ...); extern char *sha1_file_name(const unsigned char *sha1); +int safe_create_leading_directories(char *path); + /* Read and unpack a sha1 file into memory, write memory to a sha1 file */ extern void * map_sha1_file(const unsigned char *sha1, unsigned long *size); extern int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void *buffer, unsigned long size); @@ -168,6 +172,12 @@ extern int sha1_object_info(const unsigned char *, char *, unsigned long *); extern void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned long *size); extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size); extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1); +extern char *write_sha1_file_prepare(void *buf, + unsigned long len, + const char *type, + unsigned char *sha1, + unsigned char *hdr, + int *hdrlen); extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type); @@ -262,6 +272,7 @@ struct pack_entry { extern int git_connect(int fd[2], char *url, const char *prog); extern int finish_connect(pid_t pid); extern int path_match(const char *path, int nr, char **match); +extern int get_ack(int fd, unsigned char *result_sha1); extern void prepare_packed_git(void); extern int use_packed_git(struct packed_git *);