Merge remote-tracking branch 'drizzd/diff-index-tests' into development

Conflicts:
	tests-clay/clay.h
	tests-clay/clay_main.c

1 files changed, 5 insertions, 0 deletions

diff --git a/src/tree.h b/src/tree.h
index 4f8c07f08..6b2a7d36d 100644
--- a/src/tree.h
+++ b/src/tree.h
@@ -31,6 +31,11 @@ struct git_treebuilder {
 };
 
 
+GIT_INLINE(unsigned int) entry_is_tree(const struct git_tree_entry *e)
+{
+	return e->attr & 040000;
+}
+
 void git_tree__free(git_tree *tree);
 int git_tree__parse(git_tree *tree, git_odb_object *obj);