submodules: always use a relative path to gitdir

Since recently a submodule with name <name> has its git directory in the
.git/modules/<name> directory of the superproject while the work tree
contains a gitfile pointing there. When the submodule git directory needs
to be cloned because it is not found in .git/modules/<name> the clone
command will write an absolute path into the gitfile. When no clone is
necessary the git directory will be reactivated by the git-submodule.sh
script by writing a relative path into the gitfile.

This is inconsistent, as the behavior depends on the submodule having been
cloned before into the .git/modules of the superproject. A relative path
is preferable here because it allows the superproject to be moved around
without invalidating the gitfile. We do that by always writing the
relative path into the gitfile, which overwrites the absolute path the
clone command may have written there.

This is only the first step to make superprojects movable again like they
were before the separate-git-dir approach was introduced. The second step
is to use a relative path in core.worktree too.

Enhance t7400 to ensure that future versions won't re-add absolute paths
by accident.

While at it also replace an if/else construct evaluating the presence
of the 'reference' option with a single line of bash code.

Reported-by: Antony Male <antony.male@gmail.com>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-submodule.sh b/git-submodule.sh
index 9bb2e13e929c824a75c648966aaaa61672b9c445..2a93c611ea64e4c1f4f6cfa0d2dfc21d96d1a421 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -160,18 +160,15 @@ module_clone()
        if test -d "$gitdir"
        then
                mkdir -p "$path"
        if test -d "$gitdir"
        then
                mkdir -p "$path"

-               echo "gitdir: $rel_gitdir" >"$path/.git"

                rm -f "$gitdir/index"
        else
                mkdir -p "$gitdir_base"
                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
                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 695f7afdf31cc589e9c31d764d1e713ad64240c0..2b70b2298b53d5caba1337d9e1ce9c7fe3d21e19 100755 (executable)
--- 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 &&
                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
        ) &&
 
                git submodule init
        ) &&