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/t3903-stash.sh | |
| parent | 828ea97de486c1693d6e4f2c7347acb50235a85d (diff) | |
| download | git-7f814632f5d4d7af9f4225ece6039dbc44e03079.tar.gz git-7f814632f5d4d7af9f4225ece6039dbc44e03079.tar.xz | |
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/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index dbe2ac179..663c60a12 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -444,7 +444,7 @@ test_expect_success 'stash show - stashes on stack, stash-like argument' ' git reset --hard && cat >expected <<-EOF && file | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) EOF git stash show ${STASH_ID} >actual && test_cmp expected actual @@ -482,7 +482,7 @@ test_expect_success 'stash show - no stashes on stack, stash-like argument' ' git reset --hard && cat >expected <<-EOF && file | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 file changed, 1 insertion(+) EOF git stash show ${STASH_ID} >actual && test_cmp expected actual |