Merge branch 'maint'

[git.git] / dir.h

diff --git a/dir.h b/dir.h
index c94f3cb066d86a557e1e819b0996f67ceb13132b..a248a23ac4eab2aff1e91060f0e9281a8842bf6b 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -13,9 +13,7 @@
 
 
 struct dir_entry {
-       unsigned int ignored : 1;
-       unsigned int ignored_dir : 1;
-       unsigned int len : 30;
+       unsigned int len;
        char name[FLEX_ARRAY]; /* more */
 };
 
@@ -63,4 +61,9 @@ extern void add_exclude(const char *string, const char *base,
 extern int file_exists(const char *);
 extern struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len);
 
+extern char *get_relative_cwd(char *buffer, int size, const char *dir);
+extern int is_inside_dir(const char *dir);
+
+extern int remove_dir_recursively(struct strbuf *path, int only_empty);
+
 #endif