X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.c;h=0a832c35855a4bf831e40ff9183cde0569566c15;hb=85e6326cc3e7c272566c60a39741f84391830d49;hp=d75e0178ff395e2a24b7c42ea6e38faac2c93bbf;hpb=4262c1b0c38613a8c5ae729bd4d3f18f0df3ec44;p=git.git diff --git a/diff.c b/diff.c index d75e0178..0a832c35 100644 --- a/diff.c +++ b/diff.c @@ -250,13 +250,14 @@ static void show_stats(struct diffstat_t* data) for (i = 0; i < data->nr; i++) { struct diffstat_file *file = data->files[i]; + len = strlen(file->name); + if (max_len < len) + max_len = len; + if (file->is_binary || file->is_unmerged) continue; if (max_change < file->added + file->deleted) max_change = file->added + file->deleted; - len = strlen(file->name); - if (max_len < len) - max_len = len; } for (i = 0; i < data->nr; i++) {