archive mirror
 help / color / mirror / Atom feed
From: Derrick Stolee <>
To: Junio C Hamano <>
Cc: "Elijah Newren" <>,
	"ZheNing Hu" <>,
	"Emily Shaffer" <>,
	"Git List" <>,
	"Ævar Arnfjörð Bjarmason" <>,
	"Johannes Schindelin" <>,
	"Victoria Dye" <>
Subject: Re: Question relate to collaboration on git monorepo
Date: Fri, 23 Sep 2022 14:11:25 -0400	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <xmqqzgeqw0sy.fsf@gitster.g>

On 9/23/2022 11:46 AM, Junio C Hamano wrote:
> Derrick Stolee <> writes:

>> This is an interesting find! I wonder how many people are hitting this
>> in the wild. Perhaps merge.stat should be added to the optional, but
>> recommended config options in scalar.c.
> Hmph.  It somehow sounds like throwing the baby out with the
> bathwater, doesn't it.
> You are only interested in a few directories in the project.  You
> pull from somebody else (or the central repository), and end up
> getting updates to both inside and outside the areas of your
> interest.
> As a project gets larger and better modularized, does it become more
> likely that such an update will happen more often?
> I am very tempted to suggest that the diffstat after a merge in such
> a project should use the sparse cone(s) as pathspec.  Disabling the
> "what happened in this merge" report altogether is a way too blunt
> instrument, isn't it?

You're right that having a sparse-checkout-scoped diffstat is likely
to be interesting in the long term. It does require updating its
format to describe "some paths outside the sparse-checkout changed,
but we won't give you the full diffstat there".

Using something like the config to disable it in the short term
would certainly hide the pain point, but you're right that we shouldn't
stop there.


  reply	other threads:[~2022-09-23 18:11 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-20 12:42 Question relate to collaboration on git monorepo ZheNing Hu
2022-09-20 18:53 ` Emily Shaffer
2022-09-21 15:22   ` ZheNing Hu
2022-09-21 23:36     ` Elijah Newren
2022-09-22 14:24       ` Derrick Stolee
2022-09-22 15:20         ` Emily Shaffer
2022-09-23  2:08           ` Elijah Newren
2022-09-23 15:46         ` Junio C Hamano
2022-09-23 18:11           ` Derrick Stolee [this message]
2022-09-23 14:31       ` ZheNing Hu
2022-09-21  1:47 ` Elijah Newren
2022-09-21 15:42   ` ZheNing Hu

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:

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

  git send-email \ \ \ \ \ \ \ \ \ \ \

* 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).