X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=5c5e7fa91fc943e56759da556be733694184ee88;hb=4e783b41e09fb14b8ff72348ec2307fd1d5dec46;hp=9a0169c03ceb82b5cc2c246fa9f70e2f8399ec33;hpb=36b5b3c65948694d9a92de5a17f2b97c3cd84879;p=git.git

diff --git a/diff.h b/diff.h
index 9a0169c0..5c5e7fa9 100644
--- a/diff.h
+++ b/diff.h
@@ -13,6 +13,9 @@ struct tree_desc {
 	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 *);
+
 struct diff_options;
 
 typedef void (*change_fn_t)(struct diff_options *options,
@@ -60,14 +63,21 @@ struct combine_diff_path {
 	struct combine_diff_path *next;
 	int len;
 	char *path;
+	unsigned int mode;
 	unsigned char sha1[20];
-	unsigned char parent_sha1[FLEX_ARRAY][20];
+	struct combine_diff_parent {
+		unsigned int mode;
+		unsigned char sha1[20];
+	} parent[FLEX_ARRAY];
 };
+#define combine_diff_path_size(n, l) \
+	(sizeof(struct combine_diff_path) + \
+	 sizeof(struct combine_diff_parent) * (n) + (l) + 1)
 
 int show_combined_diff(struct combine_diff_path *elem, int num_parent,
-		       int dense, const char *header, int show_empty);
+		       int dense, const char *header);
 
-extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
+extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
 
 extern void diff_addremove(struct diff_options *,
 			   int addremove,