Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

submodule: absorb git dir instead of dying on deinit #1078

Closed
wants to merge 1 commit into from
Closed

submodule: absorb git dir instead of dying on deinit #1078

wants to merge 1 commit into from

Commits on Nov 19, 2021

  1. submodule: absorb git dir instead of dying on deinit 

    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 that the .git/ directory
has been absorbed into the superproject.
The rest of the deinit function can operate as it already does with
new-style submodules.

In one test, we used to require "git submodule deinit" to fail even
with the "--force" option when the submodule's .git/ directory is not
absorbed. Adjust it to expect the operation to pass.

Suggested-by: Atharva Raykar <raykar.ath@gmail.com>
Signed-off-by: Mugdha Pattnaik <mugdhapattnaik@gmail.com>
    @mugdhapattnaik
    mugdhapattnaik committed Nov 19, 2021
    Configuration menu
    Copy the full SHA
    f377240 View commit details
    Browse the repository at this point in the history