]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 12fc4ad)
diff: fix regression with --stat and unmerged file
authorPeter Grayson <redacted>
Wed, 14 Dec 2022 17:41:51 +0000 (12:41 -0500)
committerJunio C Hamano <redacted>
Thu, 15 Dec 2022 00:12:04 +0000 (09:12 +0900)
commit209d9cb0114dff72e96d58bb3c27409660f1b45c
tree3485c675b867aa08c6841f58200570fc1c931871tree
parent12fc4ad89e23af642a8614371ff80bc67cb3315dcommit | diff
diff: fix regression with --stat and unmerged file

A regression was introduced in

  12fc4ad89e (diff.c: use utf8_strwidth() to count display width, 2022-09-14)

that causes missing newlines after "Unmerged" entries in `git diff
--cached --stat` output.

This problem affects v2.39.0-rc0 through v2.39.0.

Add the missing newline along with a new test to cover this
behavior.

Signed-off-by: Peter Grayson <redacted>
Acked-by: Jeff King <redacted>
Signed-off-by: Junio C Hamano <redacted>
diff.c diff | blob | history
t/t4046-diff-unmerged.sh diff | blob | history
git clone https://git.99rst.org/PROJECT