[PATCH] Improve git-update-index error reporting

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 9f9ca8b..3deb7fa 100644 (file)
--- 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 */