Merge branch 'mr/diff-hide-stat-wo-textual-change'

[thirdparty/git.git] / diff.c

diff --git a/diff.c b/diff.c
index e3a5ee3bee8c93f1480747891cadaa824f259262..0299a730795185db71341f5d7b277205604cac59 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3153,16 +3153,19 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
        gather_dirstat(options, &dir, changed, "", 0);
 }
 
+static void free_diffstat_file(struct diffstat_file *f)
+{
+       free(f->print_name);
+       free(f->name);
+       free(f->from_name);
+       free(f);
+}
+
 void free_diffstat_info(struct diffstat_t *diffstat)
 {
        int i;
-       for (i = 0; i < diffstat->nr; i++) {
-               struct diffstat_file *f = diffstat->files[i];
-               free(f->print_name);
-               free(f->name);
-               free(f->from_name);
-               free(f);
-       }
+       for (i = 0; i < diffstat->nr; i++)
+               free_diffstat_file(diffstat->files[i]);
        free(diffstat->files);
 }
 
@@ -3718,6 +3721,27 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
                if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line,
                                  diffstat_consume, diffstat, &xpp, &xecfg))
                        die("unable to generate diffstat for %s", one->path);
+
+               if (DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two)) {
+                       struct diffstat_file *file =
+                               diffstat->files[diffstat->nr - 1];
+                       /*
+                        * Omit diffstats of modified files where nothing changed.
+                        * Even if !same_contents, this might be the case due to
+                        * ignoring whitespace changes, etc.
+                        *
+                        * But note that we special-case additions, deletions,
+                        * renames, and mode changes as adding an empty file,
+                        * for example is still of interest.
+                        */
+                       if ((p->status == DIFF_STATUS_MODIFIED)
+                               && !file->added
+                               && !file->deleted
+                               && one->mode == two->mode) {
+                               free_diffstat_file(file);
+                               diffstat->nr--;
+                       }
+               }
        }
 
        diff_free_filespec_data(one);