From c2f939170c65173076bbd752bb3c764536b3b09b Mon Sep 17 00:00:00 2001 From: Mark Levedahl Date: Wed, 9 Jul 2008 21:05:41 -0400 Subject: [PATCH] git-submodule - register submodule URL if adding in place When adding a new submodule in place, meaning the user created the submodule as a git repo in the superproject's tree first, we don't go through "git submodule init" to register the module. Thus, the submodule's origin repository URL is not stored in .git/config, and no subsequent submodule operation will ever do so. In this case, assume the URL the user supplies to "submodule add" is the one that should be registered, and do so. Signed-off-by: Mark Levedahl Signed-off-by: Junio C Hamano --- git-submodule.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/git-submodule.sh b/git-submodule.sh index c2ce2fbe8a..9228f56bee 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -172,6 +172,16 @@ cmd_add() else die "'$path' already exists and is not a valid git repo" fi + + case "$repo" in + ./*|../*) + url=$(resolve_relative_url "$repo") || exit + ;; + *) + url="$repo" + ;; + esac + git config submodule."$path".url "$url" else module_clone "$path" "$realrepo" || exit -- 2.11.4.GIT