global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-10 17:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lp/diff-stat-utf8-display-width-fix'

Browse Source 
"git log --graph --stat" did not count the display width of colored
graph part of its own output correctly, which has been corrected.

* lp/diff-stat-utf8-display-width-fix:
  t4052: test for diffstat width when prefix contains ANSI escape codes
  diff: handle ANSI escape codes in prefix when calculating diffstat width
This commit is contained in:
Junio C Hamano
2026-03-09 14:36:55 -07:00
parent 3fe08b8fd1 064b869efc
commit e757df82af
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
diff.c
View File

@@ -2756,7 +2756,9 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
count = i; /* where we can stop scanning in data->files[] */
/*
* We have width = stat_width or term_columns() columns total.
* We have width = stat_width or term_columns() columns total minus the
* length of line_prefix skipping ANSI escape codes to get the display
* width (e.g., skip ANSI-colored strings in "log --graph --stat").
* We want a maximum of min(max_len, stat_name_width) for the name part.
* We want a maximum of min(max_change, stat_graph_width) for the +- part.
* We also need 1 for " " and 4 + decimal_width(max_change)
@@ -2783,14 +2785,8 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
* separators and this message, this message will "overflow"
* making the line longer than the maximum width.
*/
/*
* NEEDSWORK: line_prefix is often used for "log --graph" output
* and contains ANSI-colored string. utf8_strnwidth() should be
* used to correctly count the display width instead of strlen().
*/
if (options->stat_width == -1)
width = term_columns() - strlen(line_prefix);
width = term_columns() - utf8_strnwidth(line_prefix, strlen(line_prefix), 1);
else
width = options->stat_width ? options->stat_width : 80;
number_width = decimal_width(max_change) > number_width ?