[PATCH] git-submodule - Fix bugs in adding an existing repo as a module
From: Mark Levedahl <hidden>
Date: 2016-06-15 22:44:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
git-submodule add would trip if path to the submodule included a space, or if its .git was a gitdir: link to a GIT_DIR kept elsewhere. Fix both. Signed-off-by: Mark Levedahl <redacted> --- git-submodule.sh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 3eb78cc..099a7d7 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh@@ -167,8 +167,7 @@ cmd_add() # perhaps the path exists and is already a git repo, else clone it if test -e "$path" then - if test -d "$path/.git" && - test "$(unset GIT_DIR; cd $path; git rev-parse --git-dir)" = ".git" + if test -d "$path"/.git -o -f "$path"/.git then echo "Adding existing repo at '$path' to the index" else
--
1.5.6.2.271.g73ad8