undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodules: always use a relative path to gitdir

Browse Source 
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>
This commit is contained in:
Jens Lehmann 2012-03-04 22:14:30 +01:00 committed by Junio C Hamano
parent 1017c1abcb
commit ea115a0d43
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-submodule.sh
View File

@ -160,18 +160,15 @@ module_clone()
if test -d "$gitdir" if test -d "$gitdir"
then then
mkdir -p "$path" mkdir -p "$path"
echo "gitdir: $rel_gitdir" >"$path/.git"
rm -f "$gitdir/index" rm -f "$gitdir/index"
else else
mkdir -p "$gitdir_base" mkdir -p "$gitdir_base"
if test -n "$reference" git clone $quiet -n ${reference:+"$reference"} \
then --separate-git-dir "$gitdir" "$url" "$path" ||
git-clone $quiet "$reference" -n "$url" "$path" --separate-git-dir "$gitdir"
else
git-clone $quiet -n "$url" "$path" --separate-git-dir "$gitdir"
fi ||
die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")" die "$(eval_gettext "Clone of '\$url' into submodule path '\$path' failed")"
fi fi
echo "gitdir: $rel_gitdir" >"$path/.git"
} }
# #

2
t/t7400-submodule-basic.sh
View File

@ -79,6 +79,8 @@ test_expect_success 'submodule add' '
cd addtest && cd addtest &&
git submodule add -q "$submodurl" submod >actual && git submodule add -q "$submodurl" submod >actual &&
test ! -s actual && test ! -s actual &&
echo "gitdir: ../.git/modules/submod" >expect &&
test_cmp expect submod/.git &&
git submodule init git submodule init
) && ) &&