diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-02-01 16:55:07 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-02-04 11:19:42 +0400 |
commit | 7f814632f5d4d7af9f4225ece6039dbc44e03079 (patch) | |
tree | 67351306175c9ccb96af4bb5456e04ddef0787d1 /t/t3300-funny-names.sh | |
parent | 828ea97de486c1693d6e4f2c7347acb50235a85d (diff) |
Use correct grammar in diffstat summary line
"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/t3300-funny-names.sh')
-rwxr-xr-x | t/t3300-funny-names.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh index 5e29a05259..9f00ada5f7 100755 --- a/t/t3300-funny-names.sh +++ b/t/t3300-funny-names.sh @@ -167,7 +167,7 @@ test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \ test_expect_success TABS_IN_FILENAMES 'setup expect' ' cat >expected <<\EOF "tabs\t,\" (dq) and spaces" - 1 files changed, 0 insertions(+), 0 deletions(-) + 1 file changed, 0 insertions(+), 0 deletions(-) EOF ' |