All of lore.kernel.org
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@arm.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Will Deacon <will@kernel.org>,
	Eric Biederman <ebiederm@xmission.com>,
	Linux ARM <linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] arm64 updates for 5.11
Date: Tue, 15 Dec 2020 10:03:42 +0000	[thread overview]
Message-ID: <20201215100342.GA2511@gaia> (raw)
In-Reply-To: <CAHk-=wi2WOYHcrZ+8gnwa6PR14LxDe3PMfqsPYyyoRTysyheUQ@mail.gmail.com>

On Mon, Dec 14, 2020 at 04:29:37PM -0800, Linus Torvalds wrote:
> On Mon, Dec 14, 2020 at 10:29 AM Catalin Marinas
> <catalin.marinas@arm.com> 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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Catalin Marinas <catalin.marinas@arm.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Will Deacon <will@kernel.org>,
	Eric Biederman <ebiederm@xmission.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linux ARM <linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] arm64 updates for 5.11
Date: Tue, 15 Dec 2020 10:03:42 +0000	[thread overview]
Message-ID: <20201215100342.GA2511@gaia> (raw)
In-Reply-To: <CAHk-=wi2WOYHcrZ+8gnwa6PR14LxDe3PMfqsPYyyoRTysyheUQ@mail.gmail.com>

On Mon, Dec 14, 2020 at 04:29:37PM -0800, Linus Torvalds wrote:
> On Mon, Dec 14, 2020 at 10:29 AM Catalin Marinas
> <catalin.marinas@arm.com> 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

  reply	other threads:[~2020-12-15 10:05 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-14 18:28 [GIT PULL] arm64 updates for 5.11 Catalin Marinas
2020-12-14 18:28 ` Catalin Marinas
2020-12-15  0:29 ` Linus Torvalds
2020-12-15  0:29   ` Linus Torvalds
2020-12-15 10:03   ` Catalin Marinas [this message]
2020-12-15 10:03     ` Catalin Marinas
2020-12-15  0:49 ` pr-tracker-bot
2020-12-15  0:49   ` pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201215100342.GA2511@gaia \
    --to=catalin.marinas@arm.com \
    --cc=akpm@linux-foundation.org \
    --cc=ebiederm@xmission.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.