diff options
| author | Peter Grayson <pete@jpgrayson.net> | 2022-12-14 12:41:51 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-15 09:12:04 +0900 |
| commit | 209d9cb0114dff72e96d58bb3c27409660f1b45c (patch) | |
| tree | 3485c675b867aa08c6841f58200570fc1c931871 /rebase.c | |
| parent | 12fc4ad89e23af642a8614371ff80bc67cb3315d (diff) | |
| download | git-209d9cb0114dff72e96d58bb3c27409660f1b45c.tar.gz | |
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 <pete@jpgrayson.net>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rebase.c')
0 files changed, 0 insertions, 0 deletions