diff options
| -rwxr-xr-x | git-submodule.sh | 11 | ||||
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 9bb2e13..2a93c61 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -160,18 +160,15 @@ module_clone() if test -d "$gitdir" then mkdir -p "$path" - echo "gitdir: $rel_gitdir" >"$path/.git" rm -f "$gitdir/index" else mkdir -p "$gitdir_base" - if test -n "$reference" - then - git-clone $quiet "$reference" -n "$url" "$path" --separate-git-dir "$gitdir" - else - git-clone $quiet -n "$url" "$path" --separate-git-dir "$gitdir" - fi || + git clone $quiet -n ${reference:+"$reference"} \ + --separate-git-dir "$gitdir" "$url" "$path" || die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")" fi + + echo "gitdir: $rel_gitdir" >"$path/.git" } # diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 695f7af..2b70b22 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -79,6 +79,8 @@ test_expect_success 'submodule add' ' cd addtest && git submodule add -q "$submodurl" submod >actual && test ! -s actual && + echo "gitdir: ../.git/modules/submod" >expect && + test_cmp expect submod/.git && git submodule init ) && |