From: Christian Couder <christian.couder@gmail.com>
Date: Tue, 28 Sep 2021 07:30:32 GMT
Subject: Re: [PATCH v4] submodule: absorb git dir instead of dying on deinit
Message-ID: <CAP8UFD3da8MPgN5FfqKOX+1noGXtX1g=oU8+PaHT_Bcxa=R0RA@mail.gmail.com>
In-Reply-To: <pull.1078.v4.git.git.1630090303445.gitgitgadget@gmail.com>

On Fri, Aug 27, 2021 at 8:53 PM Mugdha Pattnaik via GitGitGadget
<gitgitgadget@gmail.com> wrote:
>
> From: mugdha <mugdhapattnaik@gmail.com>
>
> Currently, running 'git submodule deinit' on repos where the
> submodule's '.git' is a directory, aborts with a message that is not
> exactly user friendly. Let's change this to instead warn the user
> to rerun the command with '--force'.

It seems to me that this patch fell into the cracks. Or did I miss something?

> This internally calls 'absorb_git_dir_into_superproject()', which
> moves the git dir into the superproject and replaces it with
> a '.git' file. The rest of the deinit function can operate as it
> already does with new-style submodules.
>
> We also edit a test case such that it matches the new behaviour of
> deinit.
>
> Suggested-by: Atharva Raykar <raykar.ath@gmail.com>
> Signed-off-by: Mugdha Pattnaik <mugdhapattnaik@gmail.com>