From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Norbert Kiesel <nkiesel@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [git 2.26] stat counts reported by commit and log are different
Date: Thu, 9 Apr 2020 19:12:53 -0400 [thread overview]
Message-ID: <20200409231253.GA4180345@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqq8sj4mfq5.fsf@gitster.c.googlers.com>
On Thu, Apr 09, 2020 at 03:55:30PM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > It might make sense to do so (and/or to make it possible to enable it by
> > config like we did for years with diff.renames). But it definitely is
> > way more expensive.
> > ...
> > So not quite as bad percentage-wise, but still pretty expensive. And for
> > not a huge benefit. There are ~261 impacted commits. You can see a
> > recent example with:
> >
> > git show -B -M --stat --summary ce6521e44
> >
> > where we find that most of builtin/fmt-merge-msg.c was moved to
> > fmt-merge-msg.c. It's nice, but it's expensive enough that it probably
> > shouldn't be the default.
>
> Not only that, it can cost correctness-wise. Until this
>
> https://public-inbox.org/git/xmqqegqaahnh.fsf@gitster.dls.corp.google.com/
>
> gets corrected, it is not advisable to enable -B and -M at the same
> time.
Ah, I forgot about that. I think the resulting diff might still be
useful for a human to read, but yeah, it cannot be applied (though even
there, it would be nice for it to make a little more clear to humans
what's happening with the destination file).
I wonder if we ought to remove -B from its use in status/commit, but I
guess there we are never generating a diff to apply, but rather one to
help humans understand what happened.
-Peff
prev parent reply other threads:[~2020-04-09 23:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 2:04 [git 2.26] stat counts reported by commit and log are different Norbert Kiesel
2020-04-09 13:59 ` Jeff King
2020-04-09 21:58 ` Norbert Kiesel
2020-04-09 22:47 ` Jeff King
2020-04-09 22:55 ` Junio C Hamano
2020-04-09 23:12 ` Jeff King [this message]
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=20200409231253.GA4180345@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nkiesel@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).