diff.c: omit hidden entries from namelen calculation with --stat

Currently, --stat calculates the longest name from all items but then
drops some (mode changes) from the output later on.

Instead, drop them from the namelen generation and calculation.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index 3b40e597d5793d13944f9604e5197ac216eb3a3e..0c69354d0a950fe87ab7c0deef16484ac97e987d 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1278,6 +1278,10 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
        for (i = 0; i < data->nr; i++) {
                struct diffstat_file *file = data->files[i];
                uintmax_t change = file->added + file->deleted;
        for (i = 0; i < data->nr; i++) {
                struct diffstat_file *file = data->files[i];
                uintmax_t change = file->added + file->deleted;

+               if (!data->files[i]->is_renamed &&
+                        (change == 0)) {
+                       continue;
+               }

                fill_print_name(file);
                len = strlen(file->print_name);
                if (max_len < len)
                fill_print_name(file);
                len = strlen(file->print_name);
                if (max_len < len)


@@ -1309,6 +1313,11 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
                uintmax_t deleted = data->files[i]->deleted;
                int name_len;
 
                uintmax_t deleted = data->files[i]->deleted;
                int name_len;
 

+               if (!data->files[i]->is_renamed &&
+                        (added + deleted == 0)) {
+                       total_files--;
+                       continue;
+               }

                /*
                 * "scale" the filename
                 */
                /*
                 * "scale" the filename
                 */


@@ -1343,11 +1352,6 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
                        fprintf(options->file, "  Unmerged\n");
                        continue;
                }
                        fprintf(options->file, "  Unmerged\n");
                        continue;
                }

-               else if (!data->files[i]->is_renamed &&
-                        (added + deleted == 0)) {
-                       total_files--;
-                       continue;
-               }

 
                /*
                 * scale the add/delete
 
                /*
                 * scale the add/delete