* [PATCH] git-submodule - Fix bugs in adding an existing repo as a module
@ 2008-07-08 2:36 Mark Levedahl
0 siblings, 0 replies; only message in thread
From: Mark Levedahl @ 2008-07-08 2:36 UTC (permalink / raw)
To: git; +Cc: Mark Levedahl
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 <mlevedahl@gmail.com>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-07-08 2:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-08 2:36 [PATCH] git-submodule - Fix bugs in adding an existing repo as a module Mark Levedahl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).