Merge branch 'maint-1.7.6' into maint-1.7.7

[git.git] / tree-walk.h

diff --git a/tree-walk.h b/tree-walk.h
index 7e3e0b5ad16710c06464726ac04d2b1c48af3708..0089581e1dd55800302799a7381d4a7ad01bd79d 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -44,6 +44,7 @@ struct traverse_info {
        struct traverse_info *prev;
        struct name_entry name;
        int pathlen;
+       struct pathspec *pathspec;
 
        unsigned long conflicts;
        traverse_callback_t fn;
@@ -60,4 +61,6 @@ static inline int traverse_path_len(const struct traverse_info *info, const stru
        return info->pathlen + tree_entry_len(n->path, n->sha1);
 }
 
+extern int tree_entry_interesting(const struct name_entry *, struct strbuf *, int, const struct pathspec *ps);
+
 #endif