Merge branch 'gp/branch'

diff --git a/diff.h b/diff.h
index d13fc89768087427379749479d172da31bff95b9..a7ee6d8c87887b111ef84b95266e1ff43496e7c3 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -57,6 +57,9 @@ struct diff_options {
                 find_copies_harder:1,
                 color_diff:1,
                 color_diff_words:1,
+                has_changes:1,
+                quiet:1,
+                allow_external:1,
                 exit_with_status:1;
        int context;
        int break_opt;
@@ -72,8 +75,6 @@ struct diff_options {
        const char *msg_sep;
        const char *stat_sep;
        long xdl_opts;
-       /* 0 - no differences; only meaningful if exit_with_status set */
-       int has_changes;
 
        int stat_width;
        int stat_name_width;
@@ -154,8 +155,6 @@ extern void diff_unmerge(struct diff_options *,
                         unsigned mode,
                         const unsigned char *sha1);
 
-extern int diff_scoreopt_parse(const char *opt);
-
 #define DIFF_SETUP_REVERSE             1
 #define DIFF_SETUP_USE_CACHE           2
 #define DIFF_SETUP_USE_SIZE_CACHE      4
@@ -173,8 +172,6 @@ extern int diff_setup_done(struct diff_options *);
 
 extern void diffcore_std(struct diff_options *);
 
-extern void diffcore_std_no_resolve(struct diff_options *);
-
 #define COMMON_DIFF_OPTIONS_HELP \
 "\ncommon diff options:\n" \
 "  -z            output diff-raw with lines terminated with NUL.\n" \