From 4d4b87ccb821ef159cb28ebd4fa3b2804a43a290 Mon Sep 17 00:00:00 2001 From: spacewander Date: Fri, 29 Nov 2019 17:38:28 +0800 Subject: [PATCH] git-delete-submodule: don't remove the history of deleted submodule This hurted 'git blame' and other git operation which relies on history. Fix #799. --- bin/git-delete-submodule | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/git-delete-submodule b/bin/git-delete-submodule index 9d8eea5..c3ef38b 100755 --- a/bin/git-delete-submodule +++ b/bin/git-delete-submodule @@ -20,9 +20,7 @@ test -z "$(git config --file='.gitmodules' "submodule.$NAME.url")" \ # 1. Handle the .git directory # 1.a. Delete the relevant section from .git/config git submodule deinit -f "$NAME" || abort 4 "Failed to deinitialize $NAME" -# 1.b. Delete the submodule .git directory -rm -rf ".git/modules/$NAME" -# 1.c. Delete empty submodule directory +# 1.b. Delete empty submodule directory git rm -f "$NAME" # 2. Handle .gitmodules file