Refactor git-submodule-move-all-git-dirs/git-submodule-move-git-dir

2 files changed, 17 insertions, 8 deletions

diff --git a/git-submodule-move-all-git-dirs b/git-submodule-move-all-git-dirs
index 41a7352..72e1aa3 100755
--- a/git-submodule-move-all-git-dirs
+++ b/git-submodule-move-all-git-dirs
@@ -5,15 +5,23 @@
 
 # Parameters
 BASENAME="`basename $0`"
+FOLDER="$1"
 
 # Checks
-if [ ! -e ".git" ]; then
-  echo "please run this command in the top-level repository folder"
+if [ -z "$FOLDER" ]; then
+  echo "usage: $BASENAME <repository-path>"
+  exit 1
+elif [ ! -d "$FOLDER" ]; then
+  echo "$BASENAME: repository not found: $FOLDER"
+  exit 1
+elif [ ! -e "$FOLDER/.git" ]; then
+  echo "$BASENAME: $FOLDER/.git not found"
   exit 1
 fi
 
-# If we invert find results so we begin conversion at the toplevel folders
-#find -type f -name .git | tac | while read repo; do
+cd $FOLDER
+
+# Find returns innermost folders first
 find -type f -name .git | while read repo; do
   folder="`dirname $repo`"
   git-submodule-move-git-dir $folder
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`"