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 | |
| 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>
| -rw-r--r-- | diff.c | 2 | ||||
| -rwxr-xr-x | t/t4046-diff-unmerged.sh | 10 |
2 files changed, 11 insertions, 1 deletions
@@ -2784,7 +2784,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options) else if (file->is_unmerged) { strbuf_addf(&out, " %s%s%*s | %*s", prefix, name, padding, "", - number_width, "Unmerged"); + number_width, "Unmerged\n"); emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE, out.buf, out.len, 0); strbuf_reset(&out); diff --git a/t/t4046-diff-unmerged.sh b/t/t4046-diff-unmerged.sh index 0ae0cd3a52..ffaf69335f 100755 --- a/t/t4046-diff-unmerged.sh +++ b/t/t4046-diff-unmerged.sh @@ -86,4 +86,14 @@ test_expect_success 'diff-files -3' ' test_cmp diff-files-3.expect diff-files-3.actual ' +test_expect_success 'diff --stat' ' + for path in $paths + do + echo " $path | Unmerged" || return 1 + done >diff-stat.expect && + echo " 0 files changed" >>diff-stat.expect && + git diff --cached --stat >diff-stat.actual && + test_cmp diff-stat.expect diff-stat.actual +' + test_done |