From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B776C4361B for ; Tue, 15 Dec 2020 10:05:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DFEFC22202 for ; Tue, 15 Dec 2020 10:05:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728215AbgLOKEo (ORCPT ); Tue, 15 Dec 2020 05:04:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:35420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727774AbgLOKE1 (ORCPT ); Tue, 15 Dec 2020 05:04:27 -0500 Date: Tue, 15 Dec 2020 10:03:42 +0000 From: Catalin Marinas To: Linus Torvalds Cc: Will Deacon , Eric Biederman , Andrew Morton , Linux ARM , Linux Kernel Mailing List Subject: Re: [GIT PULL] arm64 updates for 5.11 Message-ID: <20201215100342.GA2511@gaia> References: <20201214182854.14862-1-catalin.marinas@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Dec 14, 2020 at 04:29:37PM -0800, Linus Torvalds wrote: > On Mon, Dec 14, 2020 at 10:29 AM Catalin Marinas > wrote: > > > > 114 files changed, 2392 insertions(+), 1401 deletions(-) > > My diffstat looked quite different, but that turns out to be because > you use "-C" to generate your patches with not just renames, but file > copies as well. Ah, I have diff.renames=copies in my .gitconfig (I don't remember why I added it; I'll change it to the default in case I forget the "--summary" option next time). > That's all fine, but can I ask you to also use "--summary" for your > diffstat, so that the end oif the diffstat also ends up explaining > that part (and you end up with a line that says > > copy arch/arm64/include/asm/{alternative.h => alternative-macros.h} (69%) > > because as it was, it took me a while to realize why your diffstat > numbers didn't match mine at all. Thanks for the hint. I actually did a "git show --stat" on my local merge commit. This doesn't seem to honour the "--summary" option (at least the git version I have, 2.20.1). The "git diff --stat --summary" works as expected. -- Catalin