diff options
| author | Mark Levedahl <mlevedahl@gmail.com> | 2008-07-10 01:05:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-15 06:35:32 (GMT) |
| commit | c2f939170c65173076bbd752bb3c764536b3b09b (patch) | |
| tree | f46dc6c90c527f4a1808201a15c0bfca139b2d99 /git-submodule.sh | |
| parent | ec05df353c594f2afc6509831d3ce145856b0b89 (diff) | |
| download | git-c2f939170c65173076bbd752bb3c764536b3b09b.zip git-c2f939170c65173076bbd752bb3c764536b3b09b.tar.gz git-c2f939170c65173076bbd752bb3c764536b3b09b.tar.bz2 | |
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 <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index c2ce2fb..9228f56 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 |