Allow a relative builtin template directory.

diff --git a/cache.h b/cache.h
index f4f27cd70d6077e69e38184f7aad27204131fefb..dc75f9d343bd0b22398796a888c4d7088c3de71a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -290,6 +290,7 @@ extern int refresh_index(struct index_state *, unsigned int flags, const char **
 
 struct lock_file {
        struct lock_file *next;
+       int fd;
        pid_t owner;
        char on_list;
        char filename[PATH_MAX];
@@ -581,6 +582,7 @@ extern int pager_in_use;
 extern int pager_use_color;
 
 extern char *editor_program;
+extern char *excludes_file;
 
 /* base85 */
 int decode_85(char *dst, const char *line, int linelen);