[PATCH] Clean up diff_setup() to make it more extensible.

diff --git a/diff.h b/diff.h
index 0d1f9ae347fdaf9970a80ccc47114b474dafa35d..6c250237460b548e9e2ce24234de1ec63d48f413 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -28,11 +28,8 @@ extern void diff_unmerge(const char *path);
 
 extern int diff_scoreopt_parse(const char *opt);
 
-#define DIFF_FORMAT_HUMAN      0
-#define DIFF_FORMAT_MACHINE    1
-#define DIFF_FORMAT_PATCH      2
-#define DIFF_FORMAT_NO_OUTPUT  3
-extern void diff_setup(int reverse);
+#define DIFF_SETUP_REVERSE             1
+extern void diff_setup(int flags);
 
 #define DIFF_DETECT_RENAME     1
 #define DIFF_DETECT_COPY       2
@@ -44,6 +41,11 @@ 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(int output_style, int resolve_rename_copy);
 
 #endif /* DIFF_H */