undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michael J Gruber 2011-05-27 14:36:40 +02:00 committed by Junio C Hamano
parent 0b9deecf62
commit 358e460eeb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
diff.c
View File

@ -1278,6 +1278,10 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
for (i = 0; i < data->nr; i++) { for (i = 0; i < data->nr; i++) {
struct diffstat_file *file = data->files[i]; struct diffstat_file *file = data->files[i];
uintmax_t change = file->added + file->deleted; uintmax_t change = file->added + file->deleted;
if (!data->files[i]->is_renamed &&
(change == 0)) {
continue;
}
fill_print_name(file); fill_print_name(file);
len = strlen(file->print_name); len = strlen(file->print_name);
if (max_len < len) 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; uintmax_t deleted = data->files[i]->deleted;
int name_len; 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"); fprintf(options->file, " Unmerged\n");
continue; continue;
} }
else if (!data->files[i]->is_renamed &&
(added + deleted == 0)) {
total_files--;
continue;
}
/* /*
* scale the add/delete * scale the add/delete