X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=00b8804da8f74b6ea23e348adaeb8322f9b00c92;hb=6d60bbefdc2a42614069024b0a38db8c2de33967;hp=255e6b5cc7aa799eee892dcd3632cd0656e6dd1e;hpb=ac5a85181ac18b0119705f46cfa825389643df33;p=git.git

diff --git a/cache.h b/cache.h
index 255e6b5c..00b8804d 100644
--- a/cache.h
+++ b/cache.h
@@ -106,11 +106,15 @@ static inline unsigned int create_ce_mode(unsigned int mode)
 		return htonl(S_IFLNK);
 	return htonl(S_IFREG | ce_permissions(mode));
 }
+#define canon_mode(mode) \
+	(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
+	S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
 
 #define cache_entry_size(len) ((offsetof(struct cache_entry,name) + (len) + 8) & ~7)
 
 extern struct cache_entry **active_cache;
 extern unsigned int active_nr, active_alloc, active_cache_changed;
+extern struct cache_tree *active_cache_tree;
 
 #define GIT_DIR_ENVIRONMENT "GIT_DIR"
 #define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
@@ -131,6 +135,7 @@ extern const char *setup_git_directory_gently(int *);
 extern const char *setup_git_directory(void);
 extern const char *prefix_path(const char *prefix, int len, const char *path);
 extern const char *prefix_filename(const char *prefix, int len, const char *path);
+extern void verify_filename(const char *prefix, const char *name);
 
 #define alloc_nr(x) (((x)+16)*3/2)