Merge branch 'hi/grep-do-not-return-void'

[thirdparty/git.git] / diff.h

diff --git a/diff.h b/diff.h
index 7f8f024febc52e954aa06f2f2c52d954aa2d4eb2..d986ddc3b53c3dafa5cd50a9fefdfbfe64992bfc 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -245,6 +245,22 @@ void diff_emit_submodule_error(struct diff_options *o, const char *err);
 void diff_emit_submodule_pipethrough(struct diff_options *o,
                                     const char *line, int len);
 
+struct diffstat_t {
+       int nr;
+       int alloc;
+       struct diffstat_file {
+               char *from_name;
+               char *name;
+               char *print_name;
+               const char *comments;
+               unsigned is_unmerged:1;
+               unsigned is_binary:1;
+               unsigned is_renamed:1;
+               unsigned is_interesting:1;
+               uintmax_t added, deleted;
+       } **files;
+};
+
 enum color_diff {
        DIFF_RESET = 0,
        DIFF_CONTEXT = 1,
@@ -334,6 +350,10 @@ void diff_change(struct diff_options *,
 
 struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
 
+void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat,
+                     struct diff_queue_struct *q);
+void free_diffstat_info(struct diffstat_t *diffstat);
+
 #define DIFF_SETUP_REVERSE             1
 #define DIFF_SETUP_USE_SIZE_CACHE      4