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/t4013/diff.log_--patch-with-stat_master | |
| 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/t4013/diff.log_--patch-with-stat_master')
| -rw-r--r-- | t/t4013/diff.log_--patch-with-stat_master | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_master index 14595a614c..458627953e 100644 --- a/t/t4013/diff.log_--patch-with-stat_master +++ b/t/t4013/diff.log_--patch-with-stat_master @@ -15,7 +15,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000 dir/sub | 2 ++ file0 | 3 +++ file3 | 4 ++++ - 3 files changed, 9 insertions(+), 0 deletions(-) + 3 files changed, 9 insertions(+) diff --git a/dir/sub b/dir/sub index 35d242b..7289e35 100644 @@ -56,7 +56,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000 --- dir/sub | 2 ++ file1 | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 files changed, 5 insertions(+) diff --git a/dir/sub b/dir/sub index 8422d40..cead32e 100644 |