diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-10 13:59:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-10 13:59:01 -0800 |
| commit | 5febbda4e7afb4f26bed9d2dc5f9c4ceca86d2b8 (patch) | |
| tree | a98a9004d033ea6bf882bf0d131138f8a38d8c91 /git-submodule.sh | |
| parent | 38ca63f3c0ef70ba4e41d3b5e347e2c7e7d67fe5 (diff) | |
| parent | 1017c1abcb6d733e1de83eb5a1cf7e1bf4ad6aca (diff) | |
| download | git-5febbda4e7afb4f26bed9d2dc5f9c4ceca86d2b8.tar.gz | |
Merge branch 'jl/submodule-re-add' into maint
* jl/submodule-re-add:
submodule add: fix breakage when re-adding a deep submodule
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 3adab93635..9bb2e13e92 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -131,6 +131,7 @@ module_clone() gitdir= gitdir_base= name=$(module_name "$path" 2>/dev/null) + test -n "$name" || name="$path" base_path=$(dirname "$path") gitdir=$(git rev-parse --git-dir) |