X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=diff.h;h=c2c30568101d4733d421a8e1742568bde38c7167;hb=ad1d0a52dd1b5426874ebe02f074770cdec0548b;hp=d5e44baa9640d2917c69ad3463be0228288b98e4;hpb=58f6cfd8ce3c4621d4a772b81b7c92f7519154f1;p=thirdparty%2Fgit.git diff --git a/diff.h b/diff.h index d5e44baa96..c2c3056810 100644 --- a/diff.h +++ b/diff.h @@ -98,6 +98,7 @@ struct diff_flags { unsigned stat_with_summary; unsigned suppress_diff_headers; unsigned dual_color_diffed_diffs; + unsigned suppress_hunk_header_line_count; }; static inline void diff_flags_or(struct diff_flags *a, @@ -436,7 +437,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option); int run_diff_index(struct rev_info *revs, int cached); int do_diff_cache(const struct object_id *, struct diff_options *); -int diff_flush_patch_id(struct diff_options *, struct object_id *, int); +int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int); +void flush_one_hunk(struct object_id *, git_SHA_CTX *); int diff_result_code(struct diff_options *, int);