git-apply --stat: limit lines to 79 characters
It had already tried to do that, but with the independent rounding of the number of '+' and '-' characters, it would sometimes do 80-char lines after all.
This commit is contained in:
parent
66204988fe
commit
95bedc9eec
13
apply.c
13
apply.c
@ -699,7 +699,7 @@ const char minuses[]= "---------------------------------------------------------
|
||||
static void show_stats(struct patch *patch)
|
||||
{
|
||||
char *name = patch->old_name;
|
||||
int len, max, add, del;
|
||||
int len, max, add, del, total;
|
||||
|
||||
if (!name)
|
||||
name = patch->new_name;
|
||||
@ -721,9 +721,14 @@ static void show_stats(struct patch *patch)
|
||||
max = max_change;
|
||||
if (max + len > 70)
|
||||
max = 70 - len;
|
||||
|
||||
add = (patch->lines_added * max + max_change/2) / max_change;
|
||||
del = (patch->lines_deleted * max + max_change/2) / max_change;
|
||||
|
||||
add = patch->lines_added;
|
||||
del = patch->lines_deleted;
|
||||
total = add + del;
|
||||
|
||||
total = (total * max + max_change / 2) / max_change;
|
||||
add = (add * max + max_change / 2) / max_change;
|
||||
del = total - add;
|
||||
printf(" %-*s |%5d %.*s%.*s\n",
|
||||
len, name, patch->lines_added + patch->lines_deleted,
|
||||
add, pluses, del, minuses);
|
||||
|
Loading…
Reference in New Issue
Block a user