]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 914bcef 064b869)
Merge branch 'lp/diff-stat-utf8-display-width-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Mar 2026 01:21:00 +0000 (17:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Mar 2026 01:21:00 +0000 (17:21 -0800)
"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

1  2 
diff.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.