X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=cae6e14fc519be35210b1772feb8c881d333ceb1;hb=6b14d7faf0bad026a81a27bac07b47691f621b8f;hp=0b76cc42816e1f7804df6f313f24ce9be491b6e8;hpb=b46f0b6dfd09629645efc59cda76e7e4fad7ca39;p=git.git

diff --git a/diff.h b/diff.h
index 0b76cc42..cae6e14f 100644
--- a/diff.h
+++ b/diff.h
@@ -15,23 +15,35 @@ extern void diff_change(unsigned mode1, unsigned mode2,
 			     const unsigned char *sha2,
 			     const char *base, const char *path);
 
+extern void diff_guif(unsigned mode1,
+		      unsigned mode2,
+		      const unsigned char *sha1,
+		      const unsigned char *sha2,
+		      const char *path1,
+		      const char *path2);
+
 extern void diff_unmerge(const char *path);
 
-/* These are for diff-tree-helper */
-
-struct diff_spec {
-	unsigned char blob_sha1[20];
-	unsigned short mode;	 /* file mode */
-	unsigned sha1_valid : 1; /* if true, use blob_sha1 and trust mode;
-				  * however with a NULL SHA1, read them
-				  * from the file system.
-				  * if false, use the name and read mode from
-				  * the filesystem.
-				  */
-	unsigned file_valid : 1; /* if false the file does not even exist */
-};
-
-extern void run_external_diff(const char *name,
-			      struct diff_spec *, struct diff_spec *);
+extern int diff_scoreopt_parse(const char *opt);
+
+#define DIFF_FORMAT_HUMAN	0
+#define DIFF_FORMAT_MACHINE	1
+#define DIFF_FORMAT_PATCH	2
+#define DIFF_FORMAT_NO_OUTPUT	3
+extern void diff_setup(int reverse);
+
+#define DIFF_DETECT_RENAME	1
+#define DIFF_DETECT_COPY	2
+
+extern void diffcore_rename(int rename_copy, int minimum_score);
+
+extern void diffcore_prune(void);
+
+extern void diffcore_pickaxe(const char *needle);
+extern void diffcore_pathspec(const char **pathspec);
+
+extern int diff_queue_is_empty(void);
+
+extern void diff_flush(int output_style);
 
 #endif /* DIFF_H */