X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.h;h=3fcf7010e38913a697c927882895984248b9f805;hb=65c2e0c349aa5c7f605defb52dc67f1b3658a1b9;hp=ef0dfe287a5a519c7d981eb80d573495850340f1;hpb=f345b0a066572206aac4a4f9a57d746e213b6bff;p=git.git

diff --git a/diff.h b/diff.h
index ef0dfe28..3fcf7010 100644
--- a/diff.h
+++ b/diff.h
@@ -4,6 +4,10 @@
 #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)
+
 extern void diff_addremove(int addremove,
 			   unsigned mode,
 			   const unsigned char *sha1,
@@ -43,12 +47,15 @@ extern void diffcore_pickaxe(const char *needle, int opts);
 
 extern void diffcore_pathspec(const char **pathspec);
 
-extern void diffcore_break(int);
+extern void diffcore_order(const char *orderfile);
+
+extern void diffcore_break(int max_score);
 
 extern void diffcore_std(const char **paths,
 			 int detect_rename, int rename_score,
 			 const char *pickaxe, int pickaxe_opts,
-			 int break_opt);
+			 int break_opt,
+			 const char *orderfile);
 
 extern int diff_queue_is_empty(void);