X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.h;h=6c250237460b548e9e2ce24234de1ec63d48f413;hb=be020332a152ef95e0e8435fb69d8c02d5da29bb;hp=8f269b27721c3025a24c89bf16f32a6490397180;hpb=77eb2720460a3061ecdf3456d96a7093565fb4e9;p=git.git

diff --git a/diff.h b/diff.h
index 8f269b27..6c250237 100644
--- a/diff.h
+++ b/diff.h
@@ -15,26 +15,37 @@ extern void diff_change(unsigned mode1, unsigned mode2,
 			     const unsigned char *sha2,
 			     const char *base, const char *path);
 
+extern void diff_helper_input(unsigned mode1,
+			      unsigned mode2,
+			      const unsigned char *sha1,
+			      const unsigned char *sha2,
+			      const char *path1,
+			      int status,
+			      int score,
+			      const char *path2);
+
 extern void diff_unmerge(const char *path);
 
-/* These are for diff-tree-helper */
-
-struct diff_spec {
-	union {
-		const char *name;       /* path on the filesystem */
-		unsigned char sha1[20]; /* blob object ID */
-	} u;
-	unsigned short mode;	 /* file mode */
-	unsigned sha1_valid : 1; /* if true, use u.sha1 and trust mode.
-				  * (however with a NULL SHA1, read them
-				  * from the file!).
-				  * if false, use u.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_SETUP_REVERSE      	1
+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);
+
+extern void diffcore_pickaxe(const char *needle);
+extern void diffcore_pathspec(const char **pathspec);
+
+extern int diff_queue_is_empty(void);
+
+#define DIFF_FORMAT_HUMAN	0
+#define DIFF_FORMAT_MACHINE	1
+#define DIFF_FORMAT_PATCH	2
+#define DIFF_FORMAT_NO_OUTPUT	3
+
+extern void diff_flush(int output_style, int resolve_rename_copy);
 
 #endif /* DIFF_H */