From 80cd7e588430f56f52a294d5a715ed0eae6d5d21 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 7 Nov 2017 16:49:07 -0200
Subject: Refactor git-submodule-move-all-git-dirs/git-submodule-move-git-dir

---
 git-submodule-move-git-dir | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'git-submodule-move-git-dir')

diff --git a/git-submodule-move-git-dir b/git-submodule-move-git-dir
index 8c28e66..44fd054 100755
--- a/git-submodule-move-git-dir
+++ b/git-submodule-move-git-dir
@@ -30,14 +30,15 @@ elif [ -d "$MODULE/.git" ]; then
 elif [ ! -e ".git" ]; then
   echo "please run this command in the top-level repository folder"
   exit 1
-fi
-
-if [ ! -f "$MODULE/.git" ]; then
+elif [ ! -f "$MODULE/.git" ]; then
   echo "$BASENAME: not a file, or file not found: $MODULE/.git"
   exit 1
+elif [ -e "$MODULE/.gitmodules" ]; then
+  echo "$BASENAME: this repository has submodules; use git-submodule-move-all-git-dirs instead"
+  exit 1
 fi
 
-# Additional parameters
+# Setup
 RELATIVE_REPO_DIR="$(cd $MODULE &> /dev/null && cd `cut -d : -f 2 .git` &> /dev/null && pwd)"
 REPO_DIR="`pwd`"
 MODULE_DIR="`cd $MODULE &> /dev/null && pwd`"
-- 
cgit v1.2.3