X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.h;h=5c5e7fa91fc943e56759da556be733694184ee88;hb=8bb2e03b9d47d87657b67ddfaf712e736cf3db8f;hp=5696f2aff0644f331507679e0a58d7fcdc3501ec;hpb=c2f3bf071ee90b01f2d629921bb04c4f798f02fa;p=git.git

diff --git a/diff.h b/diff.h
index 5696f2af..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,
@@ -56,6 +59,26 @@ 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 {
+		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 diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
+
 extern void diff_addremove(struct diff_options *,
 			   int addremove,
 			   unsigned mode,
@@ -88,9 +111,6 @@ extern int diff_setup_done(struct diff_options *);
 
 #define DIFF_PICKAXE_ALL	1
 
-#define DIFF_DEFAULT_INDEX_ABBREV	7 /* hex digits */
-#define DIFF_DEFAULT_ABBREV	7 /* hex digits */
-
 extern void diffcore_std(struct diff_options *);
 
 extern void diffcore_std_no_resolve(struct diff_options *);