From 27cde2b0042af12d3a01d9b884fc234cea31155d Mon Sep 17 00:00:00 2001 From: Jonathan Hodgson Date: Sat, 26 Sep 2020 14:46:23 +0100 Subject: [PATCH] BIN: Updates git-delete-submodule to remove them if they've been moved The old script assumed that submodles name and path were the same, now that isn't the case --- bin/.bin/git/git-delete-submodule | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/.bin/git/git-delete-submodule b/bin/.bin/git/git-delete-submodule index 99ed0426..f942c172 100755 --- a/bin/.bin/git/git-delete-submodule +++ b/bin/.bin/git/git-delete-submodule @@ -9,15 +9,18 @@ test -z \ "$(git config --file=.gitmodules submodule."$NAME".url)" \ && echo "submodule not found" 1>&2 && exit 3 +path="$(git config --file=.gitmodules submodule."$NAME".path)" +url="$(git config --file=.gitmodules submodule."$NAME".url)" + # 1. Delete the relevant section from .git/config and clean submodule files -git submodule deinit -f "$NAME" || exit 4 -rmdir "$NAME" +git submodule deinit -f "$path" || exit 4 +rmdir "$path" rm -rf .git/modules/"$NAME" # 2. Delete the relevant line from .gitmodules git config --file=.gitmodules --remove-section submodule."$NAME" git add .gitmodules # 3. Run git rm --cached path_to_submodule -git rm --cached -rf "$NAME" +git rm --cached -rf "$path" # 4. Need to confirm and commit the changes for yourself echo echo "Now submodule $NAME is deleted."