Re: [PATCH] clone: --filter=tree:0 implies fetch.recurseSubmodules=no

From: Jeff King <peff@peff.net>
Date: Nov 21, 2020, 00:04 UTC
Message-ID: <20201121000436.GB353076@coredump.intra.peff.net>
In-Reply-To: <pull.797.git.1605904586929.gitgitgadget@gmail.com>

On Fri, Nov 20, 2020 at 08:36:26PM +0000, Derrick Stolee via GitGitGadget wrote:

Show 10 quoted lines

> I decided that even if I did populate the submodules, the nature of
> treeless clones makes me not want to care about the contents of commits
> other than those that I am explicitly navigating to.
> 
> This loop of tree fetches can be avoided by adding
> --no-recurse-submodules to the 'git fetch' command or setting
> fetch.recurseSubmodules=no.
> 
> To make this as painless as possible for future users of treeless
> clones, automatically set fetch.recurseSubmodules=no at clone time.

I think it's definitely worth adjusting the defaults here to make this less painful out of the box. But I wonder if this is too big a hammer, and the on-demand logic just needs to be a bit less aggressive.

If I clone with tree:0, I'm still going to get the tree for the thing I'm actually checking out (assuming a non-bare repo). It would be reasonable to recursively fetch the submodules in that commit to check them out (assuming you specified --recurse-submodules).

If I then fetch again, I'll end up with another tree that I'm about to checkout. So likewise, would it make sense to fetch any updates from there?

I.e., I think the problem is that whether or not cared about submodules in the first place, the default "on-demand" setting of fetch.submodules is very eager to poke through history looking at the .gitmodules file to see if there is anything worth also fetching. But:

  - if we know there are no active submodules in the first place
    (because you did not say --recurse-submodules), should it skip that
    poking? That seems like it shouldn't be too hard.

  - during its poking, should it set the necessary variables so that it
    never demand-fetches from a promisor remote? I suspect this part
    may be hard, because "fetch" and "checkout" are distinct operations
    (so during the "fetch" we don't yet have the new tree demand-fetched
    by checkout; in fact the user might not even be interested in
    checking it out yet).

Given the difficulties in the latter case, this may be the best we can do. But in that case, what happens when we _do_ care about submodules, and do:

  git clone --recurse-submodules --filter=tree:0 ...
  git fetch
  git merge origin

Will we correctly fetch-on-demand the submodules we need during the merge operation? If so, then that user experience is probably pretty reasonable.

-Peff