7f814632f5
"git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
26 lines
387 B
Bash
Executable File
26 lines
387 B
Bash
Executable File
#!/bin/sh
|
|
# Copyright (c) 2011, Google Inc.
|
|
|
|
test_description='diff --stat-count'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
>a &&
|
|
>b &&
|
|
>c &&
|
|
>d &&
|
|
git add a b c d &&
|
|
chmod +x c d &&
|
|
echo a >a &&
|
|
echo b >b &&
|
|
cat >expect <<-\EOF
|
|
a | 1 +
|
|
b | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
EOF
|
|
git diff --stat --stat-count=2 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|