Re: [PATCH v2 00/16] Remove submodule from files-backend.c

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 17, 2017, 20:49 UTC
Message-ID: <xmqq8tp4sfup.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <xmqqzihksm0i.fsf@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 14 quoted lines

> Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:
>
>> I'll be sending two more follow-up series, if you are interested, soon:
>>
>> 1) v2 of nd/worktree-gc-protection
>> ...
>> 2) the real worktree-gc-protection
>>
>> This series adds a bunch of new refs API, enough for revision.c to
>> traverses all sorts of refs with a ref store instead of "submodule".
>> Many _submodule API are removed as a result because they no longer
>> have any callers (yay!). One of them remains though.
>
> Yay indeed.

Having said all that, I have a bad news.

I won't be able to queue this as-is, as this heavily conflicts with mh/ref-remove-empty-directory that has already been cooking in 'next' for some time. I started trying conflict resolution myself and it seemed doable, but stopped after finishing perhaps 40% of it, as I cannot afford the same amount of time for conflict resolution every time the series gets rerolled.

If the topic is rebased on the result of doing:

 - checking out master^0
 - merging mh/ref-remove-empty-directory on it
 - mergeing mh/submodule-hash on the result

I suspect that we might be able start cooking it in 'pu' sooner, but I cannot spend any more time on this topic today so I'd stop analyzing the situation for now.