[PATCH] The diff-raw format updates.

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 0b76cc4..1fc8469 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -15,23 +15,27 @@ 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
+extern void diff_setup(int reverse, int diff_output_style);
+
+extern void diff_detect_rename(int, int);
+extern void diff_pickaxe(const char *);
+
+extern int diff_queue_is_empty(void);
+
+extern void diff_flush(const char **, int);
 
 #endif /* DIFF_H */