t7510: add a test case that does not need gpg

[thirdparty/git.git] / diff.h

diff --git a/diff.h b/diff.h
index 8ba85c5e60562b081ad7c12ddcddbd37e2004551..fd33caeb25dc84b53dbac18d59898bcd3cc36a7d 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -283,7 +283,7 @@ struct diff_options {
        struct diff_flags flags;
 
        /* diff-filter bits */
-       unsigned int filter;
+       unsigned int filter, filter_not;
 
        int use_color;
 
@@ -395,6 +395,7 @@ struct diff_options {
 
        struct repository *repo;
        struct option *parseopts;
+       struct strmap *additional_path_headers;
 
        int no_free;
 };
@@ -593,7 +594,7 @@ void diffcore_fix_diff_index(void);
 "                show all files diff when -S is used and hit is found.\n" \
 "  -a  --text    treat all files as text.\n"
 
-int diff_queue_is_empty(void);
+int diff_queue_is_empty(struct diff_options *o);
 void diff_flush(struct diff_options*);
 void diff_free(struct diff_options*);
 void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
@@ -633,7 +634,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option);
 int run_diff_index(struct rev_info *revs, unsigned int option);
 
 int do_diff_cache(const struct object_id *, struct diff_options *);
-int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
+int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
 void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx);
 
 int diff_result_code(struct diff_options *, int);