X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=9f0852d321bbed548fa57b5afdc3aad25c1dd943;hb=521a4f4cf4bb2d59a51a5355bfb6b148c4aa31ed;hp=6c250237460b548e9e2ce24234de1ec63d48f413;hpb=19feebc8c3ca7bd40f2f32f4f856b68b9a02870c;p=git.git

diff --git a/diff.h b/diff.h
index 6c250237..9f0852d3 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,
@@ -29,15 +33,25 @@ extern void diff_unmerge(const char *path);
 extern int diff_scoreopt_parse(const char *opt);
 
 #define DIFF_SETUP_REVERSE      	1
+#define DIFF_SETUP_USE_CACHE		2
+#define DIFF_SETUP_USE_SIZE_CACHE	4
+
 extern void diff_setup(int flags);
 
 #define DIFF_DETECT_RENAME	1
 #define DIFF_DETECT_COPY	2
 
-extern void diffcore_rename(int rename_copy, int minimum_score);
+#define DIFF_PICKAXE_ALL	1
+
+extern void diffcore_std(const char **paths,
+			 int detect_rename, int rename_score,
+			 const char *pickaxe, int pickaxe_opts,
+			 int break_opt,
+			 const char *orderfile, const char *filter);
 
-extern void diffcore_pickaxe(const char *needle);
-extern void diffcore_pathspec(const char **pathspec);
+extern void diffcore_std_no_resolve(const char **paths,
+				    const char *pickaxe, int pickaxe_opts,
+				    const char *orderfile, const char *filter);
 
 extern int diff_queue_is_empty(void);
 
@@ -46,6 +60,6 @@ extern int diff_queue_is_empty(void);
 #define DIFF_FORMAT_PATCH	2
 #define DIFF_FORMAT_NO_OUTPUT	3
 
-extern void diff_flush(int output_style, int resolve_rename_copy);
+extern void diff_flush(int output_style);
 
 #endif /* DIFF_H */