Merge branch 'jc/diff-test' into th/diff

diff --git a/diff.h b/diff.h
index 3027974c1ec74217a58345b4ab48e673ee3db710..729cd02510cfb3d39646475131ee523f03def8fb 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -20,19 +20,32 @@ typedef void (*add_remove_fn_t)(struct diff_options *options,
                    const unsigned char *sha1,
                    const char *base, const char *path);
 
+#define DIFF_FORMAT_RAW                0x0001
+#define DIFF_FORMAT_DIFFSTAT   0x0002
+#define DIFF_FORMAT_SUMMARY    0x0004
+#define DIFF_FORMAT_PATCH      0x0008
+
+/* These override all above */
+#define DIFF_FORMAT_NAME       0x0010
+#define DIFF_FORMAT_NAME_STATUS        0x0020
+#define DIFF_FORMAT_CHECKDIFF  0x0040
+
+/* Same as output_format = 0 but we know that -s flag was given
+ * and we should not give default value to output_format.
+ */
+#define DIFF_FORMAT_NO_OUTPUT  0x0080
+
 struct diff_options {
        const char *filter;
        const char *orderfile;
        const char *pickaxe;
        unsigned recursive:1,
-                with_raw:1,
-                with_stat:1,
                 tree_in_recursive:1,
                 binary:1,
                 full_index:1,
                 silent_on_remove:1,
                 find_copies_harder:1,
-                summary:1;
+                color_diff:1;
        int context;
        int break_opt;
        int detect_rename;
@@ -44,6 +57,9 @@ struct diff_options {
        int rename_limit;
        int setup;
        int abbrev;
+       const char *msg_sep;
+       const char *stat_sep;
+       long xdl_opts;
 
        int nr_paths;
        const char **paths;
@@ -52,6 +68,8 @@ struct diff_options {
        add_remove_fn_t add_remove;
 };
 
+extern const char mime_boundary_leader[];
+
 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
 extern void diff_tree_release_paths(struct diff_options *);
 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
@@ -146,14 +164,6 @@ extern void diffcore_std_no_resolve(struct diff_options *);
 "                show all files diff when -S is used and hit is found.\n"
 
 extern int diff_queue_is_empty(void);
-
-#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_STATUS        5
-#define DIFF_FORMAT_DIFFSTAT   6
-
 extern void diff_flush(struct diff_options*);
 
 /* diff-raw status letters */