X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=submodules%2Fremove;h=90cb02f6fc10904725a88f461df2c99902706bea;hb=684b1b0977c20fe1ffe172fc080854adc8031681;hp=685fbb5477ec2cb368c5c63e88a3b7a57b496d00;hpb=88545271297391f40bdcc87ab491cbc41d0f78e0;p=git-scripts.git

diff --git a/submodules/remove b/submodules/remove
index 685fbb5..90cb02f 100755
--- a/submodules/remove
+++ b/submodules/remove
@@ -6,9 +6,10 @@ if [ $# != 1 ]; then
     exit 1
 fi
 
-cd `git rev-parse --show-toplevel` || exit 1
+cd "`git rev-parse --show-toplevel`" || exit 1
 if [ \! -f .gitmodules ]; then
-    echo "The command must be run in the top-level directory" >&2
+    echo "Cannot find .gitmodules. The command must be run " >&2
+    echo "in the top-level directory of a repository with submodules" >&2
     exit 1
 fi
 
@@ -20,6 +21,6 @@ if [ -z "$path" ]; then
     exit 1
 fi
 
-git rm "$path"
-rm -rf .git/modules/"$name"
+git rm "$path" &&
+rm -rf "`git rev-parse --git-dir`"/modules/"$name" &&
 exec git config --remove-section submodule."$name"