X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=cache.h;h=514adb8f8ed621d98175bea0d701576de13eb620;hb=d1c5f2a42d7b5c0e3d3862212dea1f09809c4963;hp=e589918320f35970711c2a3609f54739a9269168;hpb=dbc37438687e110697574d175e4eca5f9cbeae81;p=git.git diff --git a/cache.h b/cache.h index e5899183..514adb8f 100644 --- a/cache.h +++ b/cache.h @@ -136,6 +136,7 @@ extern unsigned int active_nr, active_alloc, active_cache_changed; #define INDEX_ENVIRONMENT "GIT_INDEX_FILE" #define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE" +extern char *get_git_dir(void); extern char *get_object_directory(void); extern char *get_refs_directory(void); extern char *get_index_file(void); @@ -143,9 +144,9 @@ extern char *get_graft_file(void); #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES" -extern const char **get_pathspec(const char *prefix, char **pathspec); +extern const char **get_pathspec(const char *prefix, const char **pathspec); extern const char *setup_git_directory(void); -extern char *prefix_path(const char *prefix, int len, char *path); +extern const char *prefix_path(const char *prefix, int len, const char *path); #define alloc_nr(x) (((x)+16)*3/2) @@ -158,12 +159,13 @@ extern int cache_name_pos(const char *name, int namelen); #define ADD_CACHE_SKIP_DFCHECK 4 /* Ok to skip DF conflict checks */ extern int add_cache_entry(struct cache_entry *ce, int option); extern int remove_cache_entry_at(int pos); -extern int remove_file_from_cache(char *path); +extern int remove_file_from_cache(const 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 ce_modified(struct cache_entry *ce, struct stat *st); extern int ce_path_match(const struct cache_entry *ce, const char **pathspec); extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, const char *type); +extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object); extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); struct cache_file { @@ -188,6 +190,7 @@ extern char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2) extern char *sha1_file_name(const unsigned char *sha1); extern char *sha1_pack_name(const unsigned char *sha1); extern char *sha1_pack_index_name(const unsigned char *sha1); +extern const unsigned char null_sha1[20]; int git_mkstemp(char *path, size_t n, const char *template); @@ -227,6 +230,10 @@ extern int has_pack_index(const unsigned char *sha1); extern int get_sha1(const char *str, unsigned char *sha1); 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(const char *filename, unsigned char *sha1); +extern const char *resolve_ref(const char *path, unsigned char *sha1, int); +extern int create_symref(const char *git_HEAD, const char *refs_heads_master); +extern int validate_symref(const char *git_HEAD); /* General helper functions */ extern void usage(const char *err) NORETURN;