Re: sb/submodule-move-nested breaks t7411 under GIT_FSMONITOR_TEST
- From
Stefan Beller <sbeller@google.com>
- Date
- May 25, 2018, 17:27 UTC
- Message-ID
- <CAGZ79kYC=Yrw1GXLAswJyY=E3diJSp7c1bBhp4hsgnw-ApHrXw@mail.gmail.com>
- In-Reply-To
- <87lgc77wc7.fsf@evledraar.gmail.com>
Hi Ævar,
On Fri, May 25, 2018 at 5:28 AM, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
Show 23 quoted lines
>
> On Thu, May 17 2018, Junio C Hamano wrote:
>
>> * sb/submodule-move-nested (2018-03-29) 6 commits
>> (merged to 'next' on 2018-04-25 at 86b177433a)
>> + submodule: fixup nested submodules after moving the submodule
>> + submodule-config: remove submodule_from_cache
>> + submodule-config: add repository argument to submodule_from_{name, path}
>> + submodule-config: allow submodule_free to handle arbitrary repositories
>> + grep: remove "repo" arg from non-supporting funcs
>> + submodule.h: drop declaration of connect_work_tree_and_git_dir
>>
>> Moving a submodule that itself has submodule in it with "git mv"
>> forgot to make necessary adjustment to the nested sub-submodules;
>> now the codepath learned to recurse into the submodules.
>
> I didn't spot this earlier because I don't test this a lot, but I've
> bisected the following breakage down to da62f786d2 ("submodule: fixup
> nested submodules after moving the submodule", 2018-03-28) (and manually
> confirmed by reverting). On Linux both Debian & CentOS I get tests 3 and
> 4 failing with:
>
> GIT_FSMONITOR_TEST=$PWD/t7519/fsmonitor-all ./t7411-submodule-config.shI can reproduce this. I'll look into it.