Re: [PATCH] fetch: fix --depth= and --unshallow for multi-remote fetches
- From
- Rong Bao <rong.bao@csmantle.top>
- Date
- Oct 16, 2026, 10:26 UTC
- Message-ID
- <e4c6ed6c-a9be-41b9-98e3-2882b6b44102@csmantle.top>
- In-Reply-To
- <xmqq1p9qn33f.fsf@gitster.g>
Hi Junio,
On 2026-10-16 04:03, Junio C Hamano wrote:
Show 14 quoted lines
> Rong Bao <rong.bao@csmantle.top> writes: > >> When running `git fetch --all --depth=<SOME-DEPTH>` or `git fetch --all >> --unshallow` with Git 2.56.0, the fetch isn't really deepened: >> ... >> >> This is because the parent process doesn't pass the --depth= flag to the >> fetcher subprocess. >> ... >> >> Fix this by passing it when specified or implied by --unshallow. After >> fixing, both flags would work on shallow trees in conjunction with >> --all, as demonstrated below: > > The above observes that "--depth=" given to the outer "fetch --all" > is not propagated down to subfetches.
That's correct and succinct.
Show 13 quoted lines
>> diff --git a/builtin/fetch.c b/builtin/fetch.c >> index b2decc6cfdb8ae86b8b1e92caa85f4961ffc47ff..a110a2dcf09c7e6764eb232bff73286753b27009 100644 >> --- a/builtin/fetch.c >> +++ b/builtin/fetch.c >> @@ -2247,6 +2247,8 @@ static void add_options_to_argv(struct strvec *argv, > > This function is used to prepare a command line to run a single > fetch in a subprocess for 'fetch --all', and also to fetch > submodules when '--recurse-submodules' is in effect. Does the > latter case share the same problem that '--depth=<N>' is not > propagated down? Should the depth of submodules be controlled > independently by not passing '--depth=<N>' down in the first place, > in which case, this patch may be a regression for users who depend > on the behavior?
This *would* change the existing behavior when --recurse-submodules, but I beg to differ on the "regression" part. We have [0] which says:
--recurse-submodules[=(yes|on-demand|no)] Control if and under what conditions new commits of submodules should be fetched too. [...]
From the documented behavior, I don't see any specifics mentioning that options like --depth= should not apply to recursive submodule fetches. Besides, we're already passing other fetch options like --[no-]tags [1] to recursive submodule fetches, which dates back to 85566460897e ("fetch --all: pass --tags/--no-tags through to each remote") and also has an impact to the local submodule tree similar to --depth=.And, personally, I would read commands like "git fetch --unshallow --recurse-submodules" as "unshallow the tree, including all submodules".
Show 24 quoted lines
>> strvec_push(argv, "--tags");
>> else if (tags == TAGS_UNSET)
>> strvec_push(argv, "--no-tags");
>> + if (deepen)
>> + strvec_pushf(argv, "--depth=%s", depth);
> > The 'deepen' variable checked here is set to true when any of
> the '--depth=<N>', '--deepen-since=<TIME>', or
> '--shallow-exclude=<REF>' were used. If the outer
> 'fetch --all' was told to deepen with '--deepen-since=<TIME>',
> without using '--depth=<N>', what do we have in the variable
> 'depth' at this point? NULL?
> > In other words, shouldn't this be written in a more obvious,
> simple, and straightforward way as three separate additions,
> e.g.,
> > if (depth)
> strvec_pushf(argv, "--depth=%s", depth);
> if (deepen_since)
> strvec_pushf(argv, "--shallow-since=%s", deepen_since);
> if (deepen_not.nr) {
> struct string_list_item *it;
> for_each_string_list_item(it, &deepen_not) {
> strvec_pushf(argv, "--shallow-since=%s", it->string);
> }
> }I will revise in v2, and ...
Show 5 quoted lines
> Propagating 'shallow-exclude' would probably not be a good > idea if this helper function is called within the context of > recursing into submodules, as their history and refs have no > connection to the history of the top-level project. Please do > not blindly copy and paste the above to an updated patch.
... I think I'll choose to limit the scope of this patch to --depth= and --shallow-since=, since the former is what I'm originally proposing to fix, and the latter looks minimal enough to implement.
[0]: https://git-scm.com/docs/git-fetch#Documentation/git-fetch.txt---recurse-submodulesyeson-demandno [1]: https://github.com/git/git/blob/f57c9a73884400380bddd172acc88b569834f909/builtin/fetch.c#L2246-L2249
-- Regards, Rong Bao