Re: [PATCHv2 3/3] submodule absorbing: fix worktree/gitdir pointers recursively for non-moves

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 25, 2017, 22:54 UTC
Message-ID: <xmqq37g692da.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170124235651.18749-4-sbeller@google.com>

Stefan Beller <sbeller@google.com> writes:

Show 8 quoted lines

> Consider having a submodule 'sub' and a nested submodule at 'sub/nested'.
> When nested is already absorbed into sub, but sub is not absorbed into
> its superproject, then we need to fixup the gitfile and core.worktree
> setting for 'nested' when absorbing 'sub', but we do not need to move
> its git dir around.
>
> Previously 'nested's gitfile contained "gitdir: ../.git/modules/nested";
> it has to be corrected to "gitdir: ../../.git/modules/sub1/modules/nested".

That sounds like a sensible way to make things consistent.