Re: What's cooking in git.git (Oct 2018, #02; Sat, 13)

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 13, 2018, 01:03 UTC
Message-ID: <xmqqd0seac9y.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CAGZ79kZGEMWpr7aqeqXbC4bkmsCCiW+1pxbEV4T0vfsYG+_3iA@mail.gmail.com>

Stefan Beller <sbeller@google.com> writes:

Show 18 quoted lines

>> * sb/submodule-recursive-fetch-gets-the-tip (2018-10-11) 9 commits
>>  . builtin/fetch: check for submodule updates for non branch fetches
>>  . fetch: retry fetching submodules if needed objects were not fetched
>>  . submodule: fetch in submodules git directory instead of in worktree
>>  . repository: repo_submodule_init to take a submodule struct
>>  . submodule.c: do not copy around submodule list
>>  . submodule.c: move global changed_submodule_names into fetch submodule struct
>>  . submodule.c: sort changed_submodule_names before searching it
>>  . submodule.c: fix indentation
>>  . sha1-array: provide oid_array_filter
>>
>>  "git fetch --recurse-submodules" may not fetch the necessary commit
>>  that is bound to the superproject, which is getting corrected.
>>
>>  Ejected for now, as it has fallouts in places like t/helper/.
>
> This is the first time I hear about that, I'll look into that.
> The tipmost commit there is also shoddy, I'll redo that.

This is the first time I saw the breakage with this series, but I would not be suprised, as this was rerolled recently. Who knows what got changed in this series and in other topics---any new interaction can arise and that is a normal part of distributed development.

The xx/sb-submodule-recursive-fetch-gets-the-tip-in-pu branch at git://github.com/gitster/git.git has a merge of this into 'pu', with textual conflicts all resolved.

At least t/helper/test-submodule-nested-repo-config.c fails to build; I didn't check if there are other breakages.