diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-02-01 19:55:07 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-03 23:19:42 -0800 |
| commit | 7f814632f5d4d7af9f4225ece6039dbc44e03079 (patch) | |
| tree | 67351306175c9ccb96af4bb5456e04ddef0787d1 /t/t4045-diff-relative.sh | |
| parent | 828ea97de486c1693d6e4f2c7347acb50235a85d (diff) | |
| download | git-7f814632f5d4d7af9f4225ece6039dbc44e03079.tar.gz | |
Use correct grammar in diffstat summary linend/diffstat-gramnum
"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>
Diffstat (limited to 't/t4045-diff-relative.sh')
| -rwxr-xr-x | t/t4045-diff-relative.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh index 8a3c63b9e2..bd119be106 100755 --- a/t/t4045-diff-relative.sh +++ b/t/t4045-diff-relative.sh @@ -33,7 +33,7 @@ check_stat() { expect=$1; shift cat >expected <<EOF $expect | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) EOF test_expect_success "--stat $*" " git diff --stat $* HEAD^ >actual && |