git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[GSoC PATCH v2 0/2] diff: handle UTF-8 chars in prefix when calculating diffstat width

From
LorenzoPegorari <lorenzo.pegorari2002@gmail.com>
Date
Feb 27, 2026, 16:01 UTC
Message-ID
<cover.1772136203.git.lorenzo.pegorari2002@gmail.com>
In-Reply-To
<cover.1771894207.git.lorenzo.pegorari2002@gmail.com>

This patch aims to fix a bug where the calculation of the diffstat width incorrectly uses the strlen() of line_prefix instead of its actual display width.

This patch addresses the NEEDSWORK item added by ce8529b2 (diff: leave NEEDWORK notes in show_stats() function, 2022-10-21).

V2 DIFF:
* Changed references from "ANSI char" to "UTF-8 char"
* Compacted the 2 test scripts in a single script, that I placed in the
  already existing test file t4052, which "tests --stat output for
  various commands"
* Added many of the changes suggested to me by Junio C Hamano [1], in
  order to make the test easier to read and to debug
* Added a descriptive comment for the test script, and a more complete
  commit message to describe the goal of the test
[1]: https://lore.kernel.org/git/xmqqikbmk86b.fsf@gitster.g/
LorenzoPegorari (2):
  diff: handle UTF-8 chars in prefix when calculating diffstat width
  t4052: add test for diffstat width when prefix contains UTF-8 chars
 diff.c                 | 12 ++++--------
 t/b                    |  0
 t/t4052-stat-output.sh | 30 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 t/b
Range-diff against v1:
1:  a798eda511 ! 1:  9e8161a700 diff: handle ANSI chars in prefix when calculating diffstat width
    @@ Metadata
     Author: LorenzoPegorari <lorenzo.pegorari2002@gmail.com>
     
      ## Commit message ##
    -    diff: handle ANSI chars in prefix when calculating diffstat width
    +    diff: handle UTF-8 chars in prefix when calculating diffstat width
     
         The diffstat width is calculated by taking the terminal width and
    -    incorrectly subtracting the strlen() of line_prefix, instead of the
    -    actual display width of line_prefix (which may contain ANSI chars).
    +    incorrectly subtracting the `strlen()` of `line_prefix`, instead of the
    +    actual display width of `line_prefix`, which may contain UTF-8
    +    characters (e.g., ANSI-colored strings in `log --graph --stat`).
     
    -    Utilize the display width instead, obtained via utf8_strnwidth() with
    -    the flag to skip ANSI chars.
    +    Utilize the display width instead, obtained via `utf8_strnwidth()` with
    +    the flag `skip_ansi`.
     
         Signed-off-by: LorenzoPegorari <lorenzo.pegorari2002@gmail.com>
     
    @@ diff.c: static void show_stats(struct diffstat_t *data, struct diff_options *opt
      
      	/*
     -	 * 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 chars to get the
    -+	 * display width (e.g., to skip ANSI-colored strings in "log --graph").
    ++	 * We have width = stat_width or term_columns() columns total minus the
    ++	 * length of line_prefix skipping UTF-8 chars to get the display width
    ++	 * (e.g., to 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)
2:  ce25150593 < -:  ---------- t4074: add test for diffstat width when prefix contains ANSI chars
-:  ---------- > 2:  984fa10d72 t4052: add test for diffstat width when prefix contains UTF-8 chars
-- 
2.43.0
Previous: Junio C HamanoNext: LorenzoPegorari
Message 7 of 14 in “diff: handle ANSI chars in prefix when calculating diffstat width”
  1. 0/2 diff: handle ANSI chars in prefix when calculating diffstat widthLorenzoPegorari, Feb 24, 2026
  2. 1/2 diff: handle ANSI chars in prefix when calculating diffstat widthLorenzoPegorari, Feb 24, 2026
  3. 2/2 t4074: add test for diffstat width when prefix contains ANSI charsLorenzoPegorari, Feb 24, 2026
  4. Junio C HamanoFeb 24, 2026
  5. Lorenzo PegorariFeb 25, 2026
  6. Junio C HamanoFeb 24, 2026
  7. 0/2 diff: handle UTF-8 chars in prefix when calculating diffstat widthLorenzoPegorari, Feb 27, 2026
  8. 1/2 diff: handle UTF-8 chars in prefix when calculating diffstat widthLorenzoPegorari, Feb 27, 2026
  9. 2/2 t4052: add test for diffstat width when prefix contains UTF-8 charsLorenzoPegorari, Feb 27, 2026
  10. Junio C HamanoFeb 27, 2026
  11. Junio C HamanoFeb 27, 2026
  12. 0/2 diff: handle ANSI escape codes in prefix when calculating diffstat widthLorenzoPegorari, Feb 27, 2026
  13. 1/2 diff: handle ANSI escape codes in prefix when calculating diffstat widthLorenzoPegorari, Feb 27, 2026
  14. 2/2 t4052: test for diffstat width when prefix contains ANSI escape codesLorenzoPegorari, Feb 27, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.