X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=8fac465a9df9b1d8789d17f008968295baa27ad1;hb=81ea3ce2ace4d8b76dbfe2aa6b4199472115a115;hp=ff41c5859db297e13864d842d3773da93f1abfcf;hpb=a2c641c4ab66b5bdcb62c36a5f748b9f929d61b8;p=git.git

diff --git a/diff.h b/diff.h
index ff41c585..8fac465a 100644
--- a/diff.h
+++ b/diff.h
@@ -63,14 +63,23 @@ 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 {
+		char status;
+		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);
+extern int show_combined_diff(struct combine_diff_path *elem, int num_parent,
+			      int dense, const char *header,
+			      struct diff_options *);
 
-extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
+extern const char *diff_tree_combined_merge(const unsigned char *sha1, const char *, int, struct diff_options *opt);
 
 extern void diff_addremove(struct diff_options *,
 			   int addremove,