X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=eff445596d98e46d40dd37843e690de27c5fabf1;hb=313ce8cee665447e4476d7e8985b270346a8e5a1;hp=ce3058e437d5f0142be0746a3e50a3c32045eecb;hpb=1259404c7e5cd88b7f6692986469cd20cbfacdad;p=git.git

diff --git a/diff.h b/diff.h
index ce3058e43..eff445596 100644
--- a/diff.h
+++ b/diff.h
@@ -29,6 +29,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
 #define DIFF_FORMAT_NUMSTAT	0x0004
 #define DIFF_FORMAT_SUMMARY	0x0008
 #define DIFF_FORMAT_PATCH	0x0010
+#define DIFF_FORMAT_SHORTSTAT	0x0020
 
 /* These override all above */
 #define DIFF_FORMAT_NAME	0x0100
@@ -46,6 +47,7 @@ struct diff_options {
 	const char *filter;
 	const char *orderfile;
 	const char *pickaxe;
+	const char *single_follow;
 	unsigned recursive:1,
 		 tree_in_recursive:1,
 		 binary:1,
@@ -102,6 +104,8 @@ extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
 		     const char *base, struct diff_options *opt);
 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
 			  const char *base, struct diff_options *opt);
+extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
+                               struct diff_options *opt);
 
 struct combine_diff_path {
 	struct combine_diff_path *next;