X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=a268d16ff712e29fbccab779824551757f99837d;hb=2a0925be3512451834ec9a3e023f4cff23c1cfb7;hp=122c8143a3b9274380f1a66785b3d7952e8609dd;hpb=46a6c2620ba421397eec627b8eb18eb530e694fc;p=git.git

diff --git a/diff.h b/diff.h
index 122c8143..a268d16f 100644
--- a/diff.h
+++ b/diff.h
@@ -4,14 +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;
-};
+#include "tree-walk.h"
 
 struct diff_options;
 
@@ -56,6 +49,28 @@ extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
 			  const char *base, struct diff_options *opt);
 
+struct combine_diff_path {
+	struct combine_diff_path *next;
+	int len;
+	char *path;
+	unsigned int mode;
+	unsigned char sha1[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)
+
+extern int show_combined_diff(struct combine_diff_path *elem, int num_parent,
+			      int dense, const char *header,
+			      struct diff_options *);
+
+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,
 			   unsigned mode,