Skip to content

Commit dd008b3

Browse files
peffgitster
authored andcommitted
t7400: fix bogus test failure with symlinked trash
One of the tests in t7400 fails if the trash directory has a symlink anywhere in its path. E.g.: $ mkdir /tmp/git-test $ mkdir /tmp/git-test/real $ ln -s real /tmp/git-test/link $ ./t7400-submodule-basic --root=/tmp/git-test/real ... # passed all 44 test(s) $ ./t7400-submodule-basic --root=/tmp/git-test/link ... not ok - 41 use superproject as upstream when path is relative and no url is set there The failing test does: git submodule add ../repo relative && ... git submodule sync relative && test "$(git config submodule.relative.url)" = "$submodurl/repo" where $submodurl comes from the $TRASH_DIRECTORY the user gave us. However, git will resolve symlinks when converting the relative path into an absolute one, leading them to be textually different (even though they point to the same directory). Fix this by asking pwd to canonicalize the name of the trash directory for us. Signed-off-by: Jeff King <[email protected]> Acked-by: Jens Lehmann <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e44b6df commit dd008b3

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

t/t7400-submodule-basic.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ test_expect_success 'setup - repository to add submodules to' '
4747
'
4848

4949
# The 'submodule add' tests need some repository to add as a submodule.
50-
# The trash directory is a good one as any.
51-
submodurl=$TRASH_DIRECTORY
50+
# The trash directory is a good one as any. We need to canonicalize
51+
# the name, though, as some tests compare it to the absolute path git
52+
# generates, which will expand symbolic links.
53+
submodurl=$(pwd -P)
5254

5355
listbranches() {
5456
git for-each-ref --format='%(refname)' 'refs/heads/*'

0 commit comments

Comments
 (0)