From patchwork Sun Sep 20 13:09:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Guyot X-Patchwork-Id: 11787631 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D01CD139F for ; Sun, 20 Sep 2020 13:10:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C008620EDD for ; Sun, 20 Sep 2020 13:10:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726384AbgITNKq (ORCPT ); Sun, 20 Sep 2020 09:10:46 -0400 Received: from mail001-2.aei.ca ([206.123.6.133]:52634 "EHLO mail001.aei.ca" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726305AbgITNKp (ORCPT ); Sun, 20 Sep 2020 09:10:45 -0400 Received: (qmail 19784 invoked by uid 89); 20 Sep 2020 13:10:44 -0000 Received: by simscan 1.2.0 ppid: 19778, pid: 19782, t: 0.0060s scanners: regex: 1.2.0 attach: 1.2.0 Received: from mail002.aei.ca (HELO mta.aei.ca) (206.123.6.132) by mail001.aei.ca with (DHE-RSA-AES256-SHA encrypted) SMTP; 20 Sep 2020 13:10:44 -0000 Received: (qmail 20309 invoked by uid 89); 20 Sep 2020 13:10:44 -0000 Received: by simscan 1.2.0 ppid: 20303, pid: 20305, t: 0.9738s scanners: regex: 1.2.0 attach: 1.2.0 clamav: 0.97.8/m: spam: 3.3.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) X-Spam-Level: X-Spam-Status: No, hits=-3.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.1 Received: from dsl-216-221-52-235.mtl.contact.net (HELO dermoth.lan) (216.221.52.235) by mail.aei.ca with (AES256-SHA encrypted) SMTP; 20 Sep 2020 13:10:43 -0000 Received: from dermoth by dermoth.lan with local (Exim 4.92) (envelope-from ) id 1kJz75-0006uv-8E; Sun, 20 Sep 2020 09:10:43 -0400 From: Thomas Guyot-Sionnest To: git@vger.kernel.org Cc: dermoth@aei.ca, me@ttaylorr.com, peff@peff.net, Thomas Guyot-Sionnest Subject: [PATCH v2] diff: Fix modified lines stats with --stat and --numstat Date: Sun, 20 Sep 2020 09:09:46 -0400 Message-Id: <20200920130945.26399-1-tguyot@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200918113256.8699-2-tguyot@gmail.com> References: <20200918113256.8699-2-tguyot@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In builtin_diffstat(), when both files are coming from "stdin" (which could be better described as the file's content being written directly into the file object), oideq() compares two null hashes and ignores the actual differences for the statistics. This patch checks if is_stdin flag is set on both sides and compare contents directly. Signed-off-by: Thomas Guyot-Sionnest --- Range-diff: 1: 479c2835fc ! 1: 1f25713d44 diff: Fix modified lines stats with --stat and --numstat @@ -20,8 +20,12 @@ } - same_contents = oideq(&one->oid, &two->oid); ++ /* What is_stdin really means is that the file's content is only ++ * in the filespec's buffer and its oid is zero. We can't compare ++ * oid's if both are null and we can just diff the buffers */ + if (one->is_stdin && two->is_stdin) -+ same_contents = !strcmp(one->data, two->data); ++ same_contents = (one->size == two->size ? ++ !memcmp(one->data, two->data, one->size) : 0); + else + same_contents = oideq(&one->oid, &two->oid); diff.c | 9 ++++++++- t/t3206-range-diff.sh | 8 ++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index ee8e8189e9..2e47bf824e 100644 --- a/diff.c +++ b/diff.c @@ -3681,7 +3681,14 @@ static void builtin_diffstat(const char *name_a, const char *name_b, return; } - same_contents = oideq(&one->oid, &two->oid); + /* What is_stdin really means is that the file's content is only + * in the filespec's buffer and its oid is zero. We can't compare + * oid's if both are null and we can just diff the buffers */ + if (one->is_stdin && two->is_stdin) + same_contents = (one->size == two->size ? + !memcmp(one->data, two->data, one->size) : 0); + else + same_contents = oideq(&one->oid, &two->oid); if (diff_filespec_is_binary(o->repo, one) || diff_filespec_is_binary(o->repo, two)) { diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index e024cff65c..4715e75b68 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -258,11 +258,11 @@ test_expect_success 'changed commit with --stat diff option' ' a => b | 0 1 file changed, 0 insertions(+), 0 deletions(-) 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/ - a => b | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) + a => b | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ - a => b | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) + a => b | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) EOF test_cmp expect actual '