X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=32134d79b5942b21ef55549801f91b31d980e948;hb=c8568e139ed2149fbfb7ef9a8d819d5b6b7c554f;hp=081234cb97ce1a06c7acda97510dc8440d440a86;hpb=af3feefa1d057713c2277cc1543d438e60c65306;p=git.git

diff --git a/diff.h b/diff.h
index 081234cb..32134d79 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,7 +59,18 @@ 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);
 
-extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
+struct combine_diff_path {
+	struct combine_diff_path *next;
+	int len;
+	char *path;
+	unsigned char sha1[20];
+	unsigned char parent_sha1[FLEX_ARRAY][20];
+};
+
+int show_combined_diff(struct combine_diff_path *elem, int num_parent,
+		       int dense, const char *header, int show_empty);
+
+extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int, int);
 
 extern void diff_addremove(struct diff_options *,
 			   int addremove,
@@ -90,9 +104,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 *);