Junio C Hamano <gitster@xxxxxxxxx> writes: > Glen Choo <chooglen@xxxxxxxxxx> writes: > >> This reroll contains another 'easy' preparatory patch and the fixups I >> alluded to in v6 [1]. This isn't the split-up I described in the >> footnote of v6, but it gets the big patch (patch 17) to what I think is >> a reviewable state. > > Thanks. > > This seems to heavily conflict with "clone, submodule: pass partial > clone filters to submodules, 2022-02-04" by Josh Steadmon > <690d2316ad518ea4551821b2b3aa652996858475.1644034886.git.steadmon@xxxxxxxxxx> > in both builtins/submodule--helper.c and git-submodule.sh. > > It also removes the code that "submodule: record superproject gitdir > during 'update', 2022-02-03" by Emily Shaffer > <20220203215914.683922-5-emilyshaffer@xxxxxxxxxx>, so what the other > topic ends up adding to the shell script needs to eventually be > redone in the C code. > > I think "superproject aware" topic would see a reroll due to a > slight redesign. I am not sure how solid the design of the > "pass down partial clone filter" topic is at this moment. > > I may try to eject them tentatively and see how well this topic > plays with the rest of the topics in flight. > > Thanks. I can merge this to seen minus the above two topics and get it compile, but it also seems to have some interaction with 961b130d (branch: add --recurse-submodules option for branch creation, 2022-01-28) and makes the t3207, tests added by that other topic, fail X-<.
