summaryrefslogtreecommitdiff
path: root/t/t5572-pull-submodule.sh
diff options
context:
space:
mode:
authorLibravatar Mugdha Pattnaik <mugdhapattnaik@gmail.com>2021-11-19 10:56:27 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-19 09:19:54 -0800
commit0adc8ba6ae2b76501f4e0e57cc83d79be5305418 (patch)
tree261bf0f4f457b20900d7d62e39152e83bf9d339d /t/t5572-pull-submodule.sh
parentThe eleventh batch (diff)
downloadtgif-0adc8ba6ae2b76501f4e0e57cc83d79be5305418.tar.xz
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5572-pull-submodule.sh')
0 files changed, 0 insertions, 0 deletions