From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 01 Feb 2012 21:26:43 GMT
Subject: Re: [PATCH v2] Use correct grammar in diffstat summary line
Message-ID: <7vhaza2qjw.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1328100907-20397-1-git-send-email-pclouds@gmail.com>

Nice.  Will queue with a minor update to the log message:

commit 3f29ab34372ee11946439da3bde307eb90ad9031
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:   Wed Feb 1 19:55:07 2012 +0700

    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"]
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

And also this bit on top:

diff --git a/diff.c b/diff.c
index 5c31b36..5f3ce97 100644
--- a/diff.c
+++ b/diff.c
@@ -1329,7 +1329,7 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
 
 	if (!files) {
 		assert(insertions == 0 && deletions == 0);
-		return fputs(_(" no changes\n"), fp);
+		return fputs(_(" 0 files changed\n"), fp);
 	}
 
 	strbuf_addf(&sb,