]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitb9797973146ef8154590312602b98645a8427f4a
treec075eb5ffe85632c48a792bb0272351fc2e78126tree | snapshot
parent914bcef22751e3b092b3a5bb74b0503b2d1d9e9fcommit | diff
parent064b869efc50be2557015665bc3dc8ac9008a6e4commit | diff
Merge branch 'lp/diff-stat-utf8-display-width-fix' into next

"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
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.