X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=a268d16ff712e29fbccab779824551757f99837d;hb=5f2f4240022418e9a75505f11298db54a5da12d2;hp=946a4067cc4c56cb5d4b79ff13e9aecb4d99b336;hpb=94c6eb3e88a3f220ffad513e54abbb599cedab6c;p=git.git

diff --git a/diff.h b/diff.h
index 946a4067..a268d16f 100644
--- a/diff.h
+++ b/diff.h
@@ -4,17 +4,7 @@
 #ifndef DIFF_H
 #define DIFF_H
 
-#define DIFF_FILE_CANON_MODE(mode) \
-	(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
-	S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
-
-struct tree_desc {
-	void *buf;
-	unsigned long size;
-};
-
-extern void update_tree_entry(struct tree_desc *);
-extern const unsigned char *tree_entry_extract(struct tree_desc *, const char **, unsigned int *);
+#include "tree-walk.h"
 
 struct diff_options;
 
@@ -66,6 +56,7 @@ struct combine_diff_path {
 	unsigned int mode;
 	unsigned char sha1[20];
 	struct combine_diff_parent {
+		char status;
 		unsigned int mode;
 		unsigned char sha1[20];
 	} parent[FLEX_ARRAY];