From: Emily Shaffer <emilyshaffer@google.com>
To: Derrick Stolee <derrickstolee@github.com>
Cc: "Elijah Newren" <newren@gmail.com>,
"ZheNing Hu" <adlternative@gmail.com>,
"Git List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Victoria Dye" <vdye@github.com>
Subject: Re: Question relate to collaboration on git monorepo
Date: Thu, 22 Sep 2022 08:20:50 -0700 [thread overview]
Message-ID: <CAJoAoZ=yc+UA7G0MBpJYVCQ6symMQwPnpfK8Wd=sf6ebB1XOhA@mail.gmail.com> (raw)
In-Reply-To: <1c2f6cfe-a6db-c06e-5313-f5b31be42c8d@github.com>
Yeah, that's a weird one. I wonder whether the partial clone filter
setting should also imply a config shutting off diffstats?
- Emily
On Thu, Sep 22, 2022 at 7:24 AM Derrick Stolee <derrickstolee@github.com> wrote:
>
> On 9/21/2022 7:36 PM, Elijah Newren wrote:
> > On Wed, Sep 21, 2022 at 8:22 AM ZheNing Hu <adlternative@gmail.com> wrote:
>
> > Here, we do have an object download, which occurred after the merge
> > completed, so there must be something happening after the merge which
> > needs the extra blob; if we keep reading...
> >
> >> project1/file1 | 10 ++++++++++
> >> 1 file changed, 10 insertions(+)
> >
> > Ah, the 'helpful' diffstat. It downloads blobs from a promisor remote
> > just so we can see what has changed, including in the area of the
> > project we don't care about.
> >
> > (This is yet another reason it'd be nice to have a --restrict mode for
> > grep/diff/log/etc. for sparse-checkout uses, and an ability to make it
> > the default in some repo, so you could get just the diffstat within
> > the region of the project that you care about. We're discussing such
> > an idea, but it isn't implemented yet.)
> >
> >> warning: This repository uses promisor remotes. Some objects may not be loaded.
> >> blob_count1=11
> >> blob_count2=11
> >> blob_count3=12
> >>
> >> The result shows that blob count doesn't change in git fetch, but in git merge.
> >
> > If you add --no-stat to your merge command (or set merge.stat to
> > false), the extra blob will not be downloaded.
>
> 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.
>
> Thanks,
> -Stolee
next prev parent reply other threads:[~2022-09-22 15:21 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 [this message]
2022-09-23 2:08 ` Elijah Newren
2022-09-23 15:46 ` Junio C Hamano
2022-09-23 18:11 ` Derrick Stolee
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJoAoZ=yc+UA7G0MBpJYVCQ6symMQwPnpfK8Wd=sf6ebB1XOhA@mail.gmail.com' \
--to=emilyshaffer@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=adlternative@gmail.com \
--cc=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=vdye@github.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).