[PATCH] Update git-daemon documentation wrt. the --verbose parameter

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index e0a3207..96c2312 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -19,15 +19,6 @@ 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);
@@ -82,4 +73,20 @@ extern int diff_queue_is_empty(void);
 
 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 */