X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=cache.h;h=fd4988ed9a0d8f75c66127a6186aae0d5d76a913;hb=a765c99a412343c6dd3364044fbcfe49c859e7b6;hp=1b49f0f4c3c5bef6e9fe6dcf68b117880c1a956a;hpb=70b9829ea73931f7e2f23fbe5f1853e0dca5ca12;p=git.git diff --git a/cache.h b/cache.h index 1b49f0f4..fd4988ed 100644 --- a/cache.h +++ b/cache.h @@ -128,6 +128,10 @@ extern unsigned int active_nr, active_alloc, active_cache_changed; #define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY" #define INDEX_ENVIRONMENT "GIT_INDEX_FILE" #define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE" +#define TEMPLATE_DIR_ENVIRONMENT "GIT_TEMPLATE_DIRECTORY" +#ifndef DEFAULT_GIT_TEMPLATE_ENVIRONMENT +#define DEFAULT_GIT_TEMPLATE_ENVIRONMENT "/etc/git-core/templates" +#endif extern char *get_object_directory(void); extern char *get_refs_directory(void); @@ -298,12 +302,15 @@ struct ref { struct ref *next; unsigned char old_sha1[20]; unsigned char new_sha1[20]; + struct ref *peer_ref; /* when renaming */ char name[0]; }; 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 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);