X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.h;h=6c250237460b548e9e2ce24234de1ec63d48f413;hb=be020332a152ef95e0e8435fb69d8c02d5da29bb;hp=97d39ac96175a5df191023697388f14c4f7e6c7c;hpb=52e9578985fb636ec1d3f6cf794fdadd5ec896fc;p=git.git

diff --git a/diff.h b/diff.h
index 97d39ac9..6c250237 100644
--- a/diff.h
+++ b/diff.h
@@ -15,15 +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);
 
 extern int diff_scoreopt_parse(const char *opt);
 
-extern void diff_setup(int detect_rename, int minimum_score,
-		       char *pickaxe,
-		       int reverse, int raw_output,
-		       const char **spec, int cnt);
+#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(void);
+extern void diff_flush(int output_style, int resolve_rename_copy);
 
 #endif /* DIFF_H */