X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=3deb7fa4e8b6a572d5ab8d2c6a4da80478074244;hb=e468305a954d95a26bfcdec3bc6e4bd477d95676;hp=9f9ca8be5b628c5701ce414f105aaffae2c76a59;hpb=dda2d79af2d2858b37bab7f6e088d0730c0959d1;p=git.git

diff --git a/diff.h b/diff.h
index 9f9ca8be..3deb7fa4 100644
--- a/diff.h
+++ b/diff.h
@@ -75,13 +75,27 @@ extern void diffcore_std_no_resolve(const char **paths,
 
 extern int diff_queue_is_empty(void);
 
-#define DIFF_FORMAT_HUMAN	0
-#define DIFF_FORMAT_MACHINE	1
+#define DIFF_FORMAT_RAW		1
 #define DIFF_FORMAT_PATCH	2
 #define DIFF_FORMAT_NO_OUTPUT	3
 #define DIFF_FORMAT_NAME	4
-#define DIFF_FORMAT_NAME_Z	5
 
-extern void diff_flush(int output_style);
+extern void diff_flush(int output_style, int line_terminator);
+
+/* diff-raw status letters */
+#define DIFF_STATUS_ADDED		'A'
+#define DIFF_STATUS_COPIED		'C'
+#define DIFF_STATUS_DELETED		'D'
+#define DIFF_STATUS_MODIFIED		'M'
+#define DIFF_STATUS_RENAMED		'R'
+#define DIFF_STATUS_TYPE_CHANGED	'T'
+#define DIFF_STATUS_UNKNOWN		'X'
+#define DIFF_STATUS_UNMERGED		'U'
+
+/* these are not diff-raw status letters proper, but used by
+ * diffcore-filter insn to specify additional restrictions.
+ */
+#define DIFF_STATUS_FILTER_AON		'A'
+#define DIFF_STATUS_FILTER_BROKEN	'B'
 
 #endif /* DIFF_H */