From: Christian Couder <christian.couder@gmail.com>
To: Mugdha Pattnaik via GitGitGadget <gitgitgadget@gmail.com>
Cc: git <git@vger.kernel.org>, Bagas Sanjaya <bagasdotme@gmail.com>,
Atharva Raykar <raykar.ath@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Mugdha Pattnaik <mugdhapattnaik@gmail.com>
Subject: Re: [PATCH v4] submodule: absorb git dir instead of dying on deinit
Date: Tue, 28 Sep 2021 09:30:32 +0200 [thread overview]
Message-ID: <CAP8UFD3da8MPgN5FfqKOX+1noGXtX1g=oU8+PaHT_Bcxa=R0RA@mail.gmail.com> (raw)
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>
next prev parent reply other threads:[~2021-09-28 7:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 18:33 [PATCH] submodule: absorb git dir instead of dying on deinit Mugdha Pattnaik via GitGitGadget
2021-08-27 6:03 ` [PATCH v2] " Mugdha Pattnaik via GitGitGadget
2021-08-27 13:20 ` Atharva Raykar
2021-08-27 17:28 ` Junio C Hamano
2021-08-27 18:10 ` [PATCH v3] " Mugdha Pattnaik via GitGitGadget
2021-08-27 18:51 ` [PATCH v4] " Mugdha Pattnaik via GitGitGadget
2021-09-28 7:30 ` Christian Couder [this message]
2021-09-28 9:53 ` Ævar Arnfjörð Bjarmason
2021-10-06 11:45 ` Mugdha Pattnaik
2021-10-06 12:02 ` [PATCH v5] " Mugdha Pattnaik via GitGitGadget
2021-10-06 12:24 ` [PATCH v6] " Mugdha Pattnaik via GitGitGadget
2021-10-07 19:41 ` Junio C Hamano
2021-11-16 18:20 ` Mugdha Pattnaik
2021-11-16 18:54 ` Junio C Hamano
2021-11-17 5:55 ` Mugdha Pattnaik
2021-11-19 10:56 ` [PATCH v7] " Mugdha Pattnaik via GitGitGadget
2021-08-27 7:51 ` [PATCH] " Bagas Sanjaya
2021-08-27 13:13 ` Mugdha Pattnaik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAP8UFD3da8MPgN5FfqKOX+1noGXtX1g=oU8+PaHT_Bcxa=R0RA@mail.gmail.com' \
--to=christian.couder@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=mugdhapattnaik@gmail.com \
--cc=raykar.ath@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).