pull --rebase: exit early when the working directory is dirty

diff --git a/tree-walk.h b/tree-walk.h
index 903a7b0f483fec5cbb6c6b372ab49cc28b655e75..42110a465f9a8c91d1bc643dfae7a9b9c32e3719 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -7,13 +7,6 @@ struct name_entry {
        unsigned int mode;
 };
 
-static inline enum object_type object_type(unsigned int mode)
-{
-       return S_ISDIR(mode) ? OBJ_TREE :
-               S_ISGITLINK(mode) ? OBJ_COMMIT :
-               OBJ_BLOB;
-}
-
 struct tree_desc {
        const void *buffer;
        struct name_entry entry;
@@ -40,10 +33,27 @@ int tree_entry(struct tree_desc *, struct name_entry *);
 
 void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);
 
-typedef void (*traverse_callback_t)(int n, unsigned long mask, struct name_entry *entry, const char *base);
+struct traverse_info;
+typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
+int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info);
+
+struct traverse_info {
+       struct traverse_info *prev;
+       struct name_entry name;
+       int pathlen;
 
-void traverse_trees(int n, struct tree_desc *t, const char *base, traverse_callback_t callback);
+       unsigned long conflicts;
+       traverse_callback_t fn;
+       void *data;
+};
 
 int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *);
+extern char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n);
+extern void setup_traverse_info(struct traverse_info *info, const char *base);
+
+static inline int traverse_path_len(const struct traverse_info *info, const struct name_entry *n)
+{
+       return info->pathlen + tree_entry_len(n->path, n->sha1);
+}
 
 #endif