2007-06-02 03:27:42 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Lars Hjemli
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Basic porcelain support for submodules
|
|
|
|
|
|
|
|
This test tries to verify basic sanity of the init, update and status
|
2008-09-03 10:59:33 +02:00
|
|
|
subcommands of git submodule.
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2010-04-10 07:38:37 +02:00
|
|
|
test_expect_success 'setup - initial commit' '
|
|
|
|
>t &&
|
2008-09-03 10:59:33 +02:00
|
|
|
git add t &&
|
|
|
|
git commit -m "initial commit" &&
|
2010-04-10 07:38:37 +02:00
|
|
|
git branch initial
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'setup - repository in init subdirectory' '
|
2008-01-15 12:13:55 +01:00
|
|
|
mkdir init &&
|
2010-04-10 07:38:37 +02:00
|
|
|
(
|
|
|
|
cd init &&
|
|
|
|
git init &&
|
|
|
|
echo a >a &&
|
|
|
|
git add a &&
|
|
|
|
git commit -m "submodule commit 1" &&
|
|
|
|
git tag -a -m "rev-1" rev-1
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'setup - commit with gitlink' '
|
2007-06-02 03:27:42 +02:00
|
|
|
echo a >a &&
|
|
|
|
echo z >z &&
|
2008-01-15 12:13:55 +01:00
|
|
|
git add a init z &&
|
2010-04-10 07:38:37 +02:00
|
|
|
git commit -m "super commit 1"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'setup - hide init subdirectory' '
|
|
|
|
mv init .subrepo
|
|
|
|
'
|
|
|
|
|
2010-04-10 07:39:04 +02:00
|
|
|
test_expect_success 'setup - repository to add submodules to' '
|
2010-07-05 19:33:03 +02:00
|
|
|
git init addtest &&
|
|
|
|
git init addtest-ignore
|
2010-04-10 07:39:04 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
# The 'submodule add' tests need some repository to add as a submodule.
|
2011-07-30 17:05:54 +02:00
|
|
|
# The trash directory is a good one as any. We need to canonicalize
|
|
|
|
# the name, though, as some tests compare it to the absolute path git
|
|
|
|
# generates, which will expand symbolic links.
|
|
|
|
submodurl=$(pwd -P)
|
2010-04-10 07:39:04 +02:00
|
|
|
|
|
|
|
listbranches() {
|
|
|
|
git for-each-ref --format='%(refname)' 'refs/heads/*'
|
|
|
|
}
|
|
|
|
|
|
|
|
inspect() {
|
|
|
|
dir=$1 &&
|
|
|
|
dotdot="${2:-..}" &&
|
|
|
|
|
2009-03-03 16:08:20 +01:00
|
|
|
(
|
2010-04-10 07:39:04 +02:00
|
|
|
cd "$dir" &&
|
|
|
|
listbranches >"$dotdot/heads" &&
|
|
|
|
{ git symbolic-ref HEAD || :; } >"$dotdot/head" &&
|
2010-04-10 07:39:41 +02:00
|
|
|
git rev-parse HEAD >"$dotdot/head-sha1" &&
|
2010-04-10 07:39:04 +02:00
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --exit-code &&
|
|
|
|
git clean -n -d -x >"$dotdot/untracked"
|
2009-03-03 16:08:20 +01:00
|
|
|
)
|
2010-04-10 07:39:04 +02:00
|
|
|
}
|
2009-03-03 16:08:20 +01:00
|
|
|
|
|
|
|
test_expect_success 'submodule add' '
|
2010-04-10 07:39:04 +02:00
|
|
|
echo "refs/heads/master" >expect &&
|
|
|
|
>empty &&
|
|
|
|
|
2009-03-03 16:08:20 +01:00
|
|
|
(
|
|
|
|
cd addtest &&
|
2011-07-26 23:39:03 +02:00
|
|
|
git submodule add -q "$submodurl" submod >actual &&
|
|
|
|
test ! -s actual &&
|
2012-03-04 22:14:30 +01:00
|
|
|
echo "gitdir: ../.git/modules/submod" >expect &&
|
|
|
|
test_cmp expect submod/.git &&
|
2012-03-04 22:15:08 +01:00
|
|
|
(
|
|
|
|
cd submod &&
|
|
|
|
git config core.worktree >actual &&
|
|
|
|
echo "../../../submod" >expect &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
rm -f actual expect
|
|
|
|
) &&
|
2009-03-03 16:08:20 +01:00
|
|
|
git submodule init
|
2010-04-10 07:39:04 +02:00
|
|
|
) &&
|
|
|
|
|
|
|
|
rm -f heads head untracked &&
|
|
|
|
inspect addtest/submod ../.. &&
|
|
|
|
test_cmp expect heads &&
|
|
|
|
test_cmp expect head &&
|
|
|
|
test_cmp empty untracked
|
2009-03-03 16:08:20 +01:00
|
|
|
'
|
|
|
|
|
2010-07-17 17:11:43 +02:00
|
|
|
test_expect_success 'submodule add to .gitignored path fails' '
|
2010-07-05 19:33:03 +02:00
|
|
|
(
|
|
|
|
cd addtest-ignore &&
|
2010-07-17 17:11:43 +02:00
|
|
|
cat <<-\EOF >expect &&
|
|
|
|
The following path is ignored by one of your .gitignore files:
|
|
|
|
submod
|
|
|
|
Use -f if you really want to add it.
|
|
|
|
EOF
|
2010-07-05 19:33:03 +02:00
|
|
|
# Does not use test_commit due to the ignore
|
|
|
|
echo "*" > .gitignore &&
|
|
|
|
git add --force .gitignore &&
|
|
|
|
git commit -m"Ignore everything" &&
|
2010-07-17 17:11:43 +02:00
|
|
|
! git submodule add "$submodurl" submod >actual 2>&1 &&
|
2011-05-21 20:44:07 +02:00
|
|
|
test_i18ncmp expect actual
|
2010-07-17 17:11:43 +02:00
|
|
|
)
|
|
|
|
'
|
2010-07-05 19:33:03 +02:00
|
|
|
|
2010-07-17 17:11:43 +02:00
|
|
|
test_expect_success 'submodule add to .gitignored path with --force' '
|
|
|
|
(
|
|
|
|
cd addtest-ignore &&
|
|
|
|
git submodule add --force "$submodurl" submod
|
|
|
|
)
|
2010-07-05 19:33:03 +02:00
|
|
|
'
|
|
|
|
|
2009-04-19 05:42:07 +02:00
|
|
|
test_expect_success 'submodule add --branch' '
|
2010-04-10 07:39:04 +02:00
|
|
|
echo "refs/heads/initial" >expect-head &&
|
|
|
|
cat <<-\EOF >expect-heads &&
|
|
|
|
refs/heads/initial
|
|
|
|
refs/heads/master
|
|
|
|
EOF
|
|
|
|
>empty &&
|
|
|
|
|
2009-04-19 05:42:07 +02:00
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
git submodule add -b initial "$submodurl" submod-branch &&
|
2010-04-10 07:39:04 +02:00
|
|
|
git submodule init
|
|
|
|
) &&
|
|
|
|
|
|
|
|
rm -f heads head untracked &&
|
|
|
|
inspect addtest/submod-branch ../.. &&
|
|
|
|
test_cmp expect-heads heads &&
|
|
|
|
test_cmp expect-head head &&
|
|
|
|
test_cmp empty untracked
|
2009-04-19 05:42:07 +02:00
|
|
|
'
|
|
|
|
|
2009-03-03 16:08:21 +01:00
|
|
|
test_expect_success 'submodule add with ./ in path' '
|
2010-04-10 07:39:04 +02:00
|
|
|
echo "refs/heads/master" >expect &&
|
|
|
|
>empty &&
|
|
|
|
|
2009-03-03 16:08:20 +01:00
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
git submodule add "$submodurl" ././dotsubmod/./frotz/./ &&
|
|
|
|
git submodule init
|
2010-04-10 07:39:04 +02:00
|
|
|
) &&
|
|
|
|
|
|
|
|
rm -f heads head untracked &&
|
|
|
|
inspect addtest/dotsubmod/frotz ../../.. &&
|
|
|
|
test_cmp expect heads &&
|
|
|
|
test_cmp expect head &&
|
|
|
|
test_cmp empty untracked
|
2009-03-03 16:08:20 +01:00
|
|
|
'
|
|
|
|
|
2009-03-03 16:08:21 +01:00
|
|
|
test_expect_success 'submodule add with // in path' '
|
2010-04-10 07:39:04 +02:00
|
|
|
echo "refs/heads/master" >expect &&
|
|
|
|
>empty &&
|
|
|
|
|
2009-03-03 16:08:20 +01:00
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
git submodule add "$submodurl" slashslashsubmod///frotz// &&
|
|
|
|
git submodule init
|
2010-04-10 07:39:04 +02:00
|
|
|
) &&
|
|
|
|
|
|
|
|
rm -f heads head untracked &&
|
|
|
|
inspect addtest/slashslashsubmod/frotz ../../.. &&
|
|
|
|
test_cmp expect heads &&
|
|
|
|
test_cmp expect head &&
|
|
|
|
test_cmp empty untracked
|
2009-03-03 16:08:20 +01:00
|
|
|
'
|
|
|
|
|
2009-03-03 16:08:21 +01:00
|
|
|
test_expect_success 'submodule add with /.. in path' '
|
2010-04-10 07:39:04 +02:00
|
|
|
echo "refs/heads/master" >expect &&
|
|
|
|
>empty &&
|
|
|
|
|
2009-03-03 16:08:20 +01:00
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
git submodule add "$submodurl" dotdotsubmod/../realsubmod/frotz/.. &&
|
|
|
|
git submodule init
|
2010-04-10 07:39:04 +02:00
|
|
|
) &&
|
|
|
|
|
|
|
|
rm -f heads head untracked &&
|
|
|
|
inspect addtest/realsubmod ../.. &&
|
|
|
|
test_cmp expect heads &&
|
|
|
|
test_cmp expect head &&
|
|
|
|
test_cmp empty untracked
|
2009-03-03 16:08:20 +01:00
|
|
|
'
|
|
|
|
|
2009-03-03 16:08:21 +01:00
|
|
|
test_expect_success 'submodule add with ./, /.. and // in path' '
|
2010-04-10 07:39:04 +02:00
|
|
|
echo "refs/heads/master" >expect &&
|
|
|
|
>empty &&
|
|
|
|
|
2009-03-03 16:08:20 +01:00
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
git submodule add "$submodurl" dot/dotslashsubmod/./../..////realsubmod2/a/b/c/d/../../../../frotz//.. &&
|
|
|
|
git submodule init
|
2010-04-10 07:39:04 +02:00
|
|
|
) &&
|
|
|
|
|
|
|
|
rm -f heads head untracked &&
|
|
|
|
inspect addtest/realsubmod2 ../.. &&
|
|
|
|
test_cmp expect heads &&
|
|
|
|
test_cmp expect head &&
|
|
|
|
test_cmp empty untracked
|
2009-03-03 16:08:20 +01:00
|
|
|
'
|
|
|
|
|
2010-04-10 07:39:41 +02:00
|
|
|
test_expect_success 'setup - add an example entry to .gitmodules' '
|
|
|
|
GIT_CONFIG=.gitmodules \
|
|
|
|
git config submodule.example.url git://example.com/init.git
|
|
|
|
'
|
|
|
|
|
2007-06-11 21:12:24 +02:00
|
|
|
test_expect_success 'status should fail for unmapped paths' '
|
2010-04-10 07:39:41 +02:00
|
|
|
test_must_fail git submodule status
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'setup - map path in .gitmodules' '
|
|
|
|
cat <<\EOF >expect &&
|
|
|
|
[submodule "example"]
|
|
|
|
url = git://example.com/init.git
|
|
|
|
path = init
|
|
|
|
EOF
|
|
|
|
|
|
|
|
GIT_CONFIG=.gitmodules git config submodule.example.path init &&
|
|
|
|
|
|
|
|
test_cmp expect .gitmodules
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'status should only print one line' '
|
2010-04-10 07:39:41 +02:00
|
|
|
git submodule status >lines &&
|
2012-04-11 13:24:01 +02:00
|
|
|
test_line_count = 1 lines
|
2010-04-10 07:39:41 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'setup - fetch commit name from submodule' '
|
|
|
|
rev1=$(cd .subrepo && git rev-parse HEAD) &&
|
|
|
|
printf "rev1: %s\n" "$rev1" &&
|
|
|
|
test -n "$rev1"
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'status should initially be "missing"' '
|
2010-04-10 07:39:41 +02:00
|
|
|
git submodule status >lines &&
|
|
|
|
grep "^-$rev1" lines
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
2007-06-06 11:13:02 +02:00
|
|
|
test_expect_success 'init should register submodule url in .git/config' '
|
2010-04-10 07:39:41 +02:00
|
|
|
echo git://example.com/init.git >expect &&
|
|
|
|
|
2008-09-03 10:59:33 +02:00
|
|
|
git submodule init &&
|
2010-04-10 07:39:41 +02:00
|
|
|
git config submodule.example.url >url &&
|
|
|
|
git config submodule.example.url ./.subrepo &&
|
|
|
|
|
|
|
|
test_cmp expect url
|
2007-06-06 11:13:02 +02:00
|
|
|
'
|
|
|
|
|
2012-08-14 22:35:27 +02:00
|
|
|
test_failure_with_unknown_submodule () {
|
|
|
|
test_must_fail git submodule $1 no-such-submodule 2>output.err &&
|
|
|
|
grep "^error: .*no-such-submodule" output.err
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'init should fail with unknown submodule' '
|
|
|
|
test_failure_with_unknown_submodule init
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'update should fail with unknown submodule' '
|
|
|
|
test_failure_with_unknown_submodule update
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'status should fail with unknown submodule' '
|
|
|
|
test_failure_with_unknown_submodule status
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'sync should fail with unknown submodule' '
|
|
|
|
test_failure_with_unknown_submodule sync
|
|
|
|
'
|
|
|
|
|
2007-06-06 11:13:02 +02:00
|
|
|
test_expect_success 'update should fail when path is used by a file' '
|
2010-04-10 07:39:41 +02:00
|
|
|
echo hello >expect &&
|
|
|
|
|
2008-01-15 12:13:55 +01:00
|
|
|
echo "hello" >init &&
|
2010-04-10 07:39:41 +02:00
|
|
|
test_must_fail git submodule update &&
|
|
|
|
|
|
|
|
test_cmp expect init
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
2007-06-06 11:13:02 +02:00
|
|
|
test_expect_success 'update should fail when path is used by a nonempty directory' '
|
2010-04-10 07:39:41 +02:00
|
|
|
echo hello >expect &&
|
|
|
|
|
|
|
|
rm -fr init &&
|
2008-01-15 12:13:55 +01:00
|
|
|
mkdir init &&
|
|
|
|
echo "hello" >init/a &&
|
2010-04-10 07:39:41 +02:00
|
|
|
|
|
|
|
test_must_fail git submodule update &&
|
|
|
|
|
|
|
|
test_cmp expect init/a
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
2007-06-06 11:13:02 +02:00
|
|
|
test_expect_success 'update should work when path is an empty dir' '
|
2010-04-10 07:39:41 +02:00
|
|
|
rm -fr init &&
|
|
|
|
rm -f head-sha1 &&
|
|
|
|
echo "$rev1" >expect &&
|
|
|
|
|
2008-01-15 12:13:55 +01:00
|
|
|
mkdir init &&
|
2011-07-26 23:39:03 +02:00
|
|
|
git submodule update -q >update.out &&
|
|
|
|
test ! -s update.out &&
|
2010-04-10 07:39:41 +02:00
|
|
|
|
|
|
|
inspect init &&
|
|
|
|
test_cmp expect head-sha1
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
2007-06-06 11:13:02 +02:00
|
|
|
test_expect_success 'status should be "up-to-date" after update' '
|
2010-04-10 07:39:41 +02:00
|
|
|
git submodule status >list &&
|
|
|
|
grep "^ $rev1" list
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'status should be "modified" after submodule commit' '
|
2010-04-10 07:39:41 +02:00
|
|
|
(
|
|
|
|
cd init &&
|
|
|
|
echo b >b &&
|
|
|
|
git add b &&
|
|
|
|
git commit -m "submodule commit 2"
|
|
|
|
) &&
|
|
|
|
|
|
|
|
rev2=$(cd init && git rev-parse HEAD) &&
|
|
|
|
test -n "$rev2" &&
|
|
|
|
git submodule status >list &&
|
|
|
|
|
|
|
|
grep "^+$rev2" list
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'the --cached sha1 should be rev1' '
|
2010-04-10 07:39:41 +02:00
|
|
|
git submodule --cached status >list &&
|
|
|
|
grep "^+$rev1" list
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
2007-09-08 12:30:22 +02:00
|
|
|
test_expect_success 'git diff should report the SHA1 of the new submodule commit' '
|
2010-04-10 07:39:41 +02:00
|
|
|
git diff >diff &&
|
|
|
|
grep "^+Subproject commit $rev2" diff
|
2007-09-08 12:30:22 +02:00
|
|
|
'
|
|
|
|
|
2007-06-02 03:27:42 +02:00
|
|
|
test_expect_success 'update should checkout rev1' '
|
2010-04-10 07:39:41 +02:00
|
|
|
rm -f head-sha1 &&
|
|
|
|
echo "$rev1" >expect &&
|
|
|
|
|
2008-09-03 10:59:33 +02:00
|
|
|
git submodule update init &&
|
2010-04-10 07:39:41 +02:00
|
|
|
inspect init &&
|
|
|
|
|
|
|
|
test_cmp expect head-sha1
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'status should be "up-to-date" after update' '
|
2010-04-10 07:39:41 +02:00
|
|
|
git submodule status >list &&
|
|
|
|
grep "^ $rev1" list
|
2007-06-02 03:27:42 +02:00
|
|
|
'
|
|
|
|
|
2007-07-17 20:28:28 +02:00
|
|
|
test_expect_success 'checkout superproject with subproject already present' '
|
2008-09-03 10:59:33 +02:00
|
|
|
git checkout initial &&
|
|
|
|
git checkout master
|
2007-07-17 20:28:28 +02:00
|
|
|
'
|
|
|
|
|
2007-08-15 19:22:09 +02:00
|
|
|
test_expect_success 'apply submodule diff' '
|
2010-04-10 07:39:41 +02:00
|
|
|
>empty &&
|
|
|
|
|
2007-08-15 19:22:09 +02:00
|
|
|
git branch second &&
|
|
|
|
(
|
2008-01-15 12:13:55 +01:00
|
|
|
cd init &&
|
2007-08-15 19:22:09 +02:00
|
|
|
echo s >s &&
|
|
|
|
git add s &&
|
|
|
|
git commit -m "change subproject"
|
|
|
|
) &&
|
2008-01-15 12:13:55 +01:00
|
|
|
git update-index --add init &&
|
2008-09-03 10:59:33 +02:00
|
|
|
git commit -m "change init" &&
|
|
|
|
git format-patch -1 --stdout >P.diff &&
|
2007-08-15 19:22:09 +02:00
|
|
|
git checkout second &&
|
|
|
|
git apply --index P.diff &&
|
2010-04-10 07:39:41 +02:00
|
|
|
|
|
|
|
git diff --cached master >staged &&
|
|
|
|
test_cmp empty staged
|
2007-08-15 19:22:09 +02:00
|
|
|
'
|
|
|
|
|
2008-05-16 12:23:03 +02:00
|
|
|
test_expect_success 'update --init' '
|
|
|
|
mv init init2 &&
|
|
|
|
git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
|
2010-04-10 07:39:41 +02:00
|
|
|
git config --remove-section submodule.example &&
|
|
|
|
test_must_fail git config submodule.example.url &&
|
|
|
|
|
2008-05-16 12:23:03 +02:00
|
|
|
git submodule update init > update.out &&
|
2010-04-10 07:39:41 +02:00
|
|
|
cat update.out &&
|
2011-05-21 20:44:08 +02:00
|
|
|
test_i18ngrep "not initialized" update.out &&
|
2011-08-15 23:17:46 +02:00
|
|
|
test_must_fail git rev-parse --resolve-git-dir init/.git &&
|
2010-04-10 07:39:41 +02:00
|
|
|
|
2008-05-16 12:23:03 +02:00
|
|
|
git submodule update --init init &&
|
2011-08-15 23:17:46 +02:00
|
|
|
git rev-parse --resolve-git-dir init/.git
|
2008-05-16 12:23:03 +02:00
|
|
|
'
|
|
|
|
|
2009-01-02 19:08:40 +01:00
|
|
|
test_expect_success 'do not add files from a submodule' '
|
|
|
|
|
|
|
|
git reset --hard &&
|
|
|
|
test_must_fail git add init/a
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'gracefully add submodule with a trailing slash' '
|
|
|
|
|
|
|
|
git reset --hard &&
|
|
|
|
git commit -m "commit subproject" init &&
|
|
|
|
(cd init &&
|
|
|
|
echo b > a) &&
|
|
|
|
git add init/ &&
|
|
|
|
git diff --exit-code --cached init &&
|
|
|
|
commit=$(cd init &&
|
|
|
|
git commit -m update a >/dev/null &&
|
|
|
|
git rev-parse HEAD) &&
|
|
|
|
git add init/ &&
|
|
|
|
test_must_fail git diff --exit-code --cached init &&
|
|
|
|
test $commit = $(git ls-files --stage |
|
|
|
|
sed -n "s/^160000 \([^ ]*\).*/\1/p")
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2009-02-07 14:43:03 +01:00
|
|
|
test_expect_success 'ls-files gracefully handles trailing slash' '
|
|
|
|
|
|
|
|
test "init" = "$(git ls-files init/)"
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2010-01-11 03:59:54 +01:00
|
|
|
test_expect_success 'moving to a commit without submodule does not leave empty dir' '
|
|
|
|
rm -rf init &&
|
|
|
|
mkdir init &&
|
|
|
|
git reset --hard &&
|
|
|
|
git checkout initial &&
|
|
|
|
test ! -d init &&
|
|
|
|
git checkout second
|
|
|
|
'
|
|
|
|
|
2009-02-07 14:43:15 +01:00
|
|
|
test_expect_success 'submodule <invalid-path> warns' '
|
2012-08-14 22:35:27 +02:00
|
|
|
test_failure_with_unknown_submodule
|
2009-02-07 14:43:15 +01:00
|
|
|
'
|
|
|
|
|
2009-09-22 17:10:12 +02:00
|
|
|
test_expect_success 'add submodules without specifying an explicit path' '
|
|
|
|
mkdir repo &&
|
2010-09-07 03:42:54 +02:00
|
|
|
(
|
|
|
|
cd repo &&
|
|
|
|
git init &&
|
|
|
|
echo r >r &&
|
|
|
|
git add r &&
|
|
|
|
git commit -m "repo commit 1"
|
2010-09-06 20:39:54 +02:00
|
|
|
) &&
|
2009-09-22 17:10:12 +02:00
|
|
|
git clone --bare repo/ bare.git &&
|
2010-12-05 00:27:35 +01:00
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
git submodule add "$submodurl/repo" &&
|
|
|
|
git config -f .gitmodules submodule.repo.path repo &&
|
|
|
|
git submodule add "$submodurl/bare.git" &&
|
|
|
|
git config -f .gitmodules submodule.bare.path bare
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'add should fail when path is used by a file' '
|
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
touch file &&
|
|
|
|
test_must_fail git submodule add "$submodurl/repo" file
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'add should fail when path is used by an existing directory' '
|
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
mkdir empty-dir &&
|
|
|
|
test_must_fail git submodule add "$submodurl/repo" empty-dir
|
|
|
|
)
|
2009-09-22 17:10:12 +02:00
|
|
|
'
|
|
|
|
|
2011-06-06 21:58:04 +02:00
|
|
|
test_expect_success 'use superproject as upstream when path is relative and no url is set there' '
|
2011-06-06 21:57:01 +02:00
|
|
|
(
|
|
|
|
cd addtest &&
|
2011-06-06 21:58:04 +02:00
|
|
|
git submodule add ../repo relative &&
|
|
|
|
test "$(git config -f .gitmodules submodule.relative.url)" = ../repo &&
|
|
|
|
git submodule sync relative &&
|
|
|
|
test "$(git config submodule.relative.url)" = "$submodurl/repo"
|
2011-06-06 21:57:01 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2011-01-10 11:37:26 +01:00
|
|
|
test_expect_success 'set up for relative path tests' '
|
|
|
|
mkdir reltest &&
|
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
git init &&
|
|
|
|
mkdir sub &&
|
|
|
|
(
|
|
|
|
cd sub &&
|
|
|
|
git init &&
|
|
|
|
test_commit foo
|
|
|
|
) &&
|
|
|
|
git add sub &&
|
|
|
|
git config -f .gitmodules submodule.sub.path sub &&
|
|
|
|
git config -f .gitmodules submodule.sub.url ../subrepo &&
|
2012-06-03 11:46:47 +02:00
|
|
|
cp .git/config pristine-.git-config &&
|
|
|
|
cp .gitmodules pristine-.gitmodules
|
2011-01-10 11:37:26 +01:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-03 11:46:47 +02:00
|
|
|
test_expect_success '../subrepo works with URL - ssh://hostname/repo' '
|
2011-01-10 11:37:26 +01:00
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
2012-06-03 11:46:47 +02:00
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
2011-01-10 11:37:26 +01:00
|
|
|
git config remote.origin.url ssh://hostname/repo &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = ssh://hostname/subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-03 11:46:47 +02:00
|
|
|
test_expect_success '../subrepo works with port-qualified URL - ssh://hostname:22/repo' '
|
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
git config remote.origin.url ssh://hostname:22/repo &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = ssh://hostname:22/subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-14 14:10:27 +02:00
|
|
|
# About the choice of the path in the next test:
|
|
|
|
# - double-slash side-steps path mangling issues on Windows
|
|
|
|
# - it is still an absolute local path
|
|
|
|
# - there cannot be a server with a blank in its name just in case the
|
|
|
|
# path is used erroneously to access a //server/share style path
|
|
|
|
test_expect_success '../subrepo path works with local path - //somewhere else/repo' '
|
2012-06-03 11:46:47 +02:00
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
2012-06-14 14:10:27 +02:00
|
|
|
git config remote.origin.url "//somewhere else/repo" &&
|
2012-06-03 11:46:47 +02:00
|
|
|
git submodule init &&
|
2012-06-14 14:10:27 +02:00
|
|
|
test "$(git config submodule.sub.url)" = "//somewhere else/subrepo"
|
2012-06-03 11:46:47 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '../subrepo works with file URL - file:///tmp/repo' '
|
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
git config remote.origin.url file:///tmp/repo &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = file:///tmp/subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '../subrepo works with helper URL- helper:://hostname/repo' '
|
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
git config remote.origin.url helper:://hostname/repo &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = helper:://hostname/subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '../subrepo works with scp-style URL - user@host:repo' '
|
2011-01-10 11:37:26 +01:00
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
git config remote.origin.url user@host:repo &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = user@host:subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-03 11:46:47 +02:00
|
|
|
test_expect_success '../subrepo works with scp-style URL - user@host:path/to/repo' '
|
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
git config remote.origin.url user@host:path/to/repo &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = user@host:path/to/subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-06 13:57:30 +02:00
|
|
|
test_expect_success '../subrepo works with relative local path - foo' '
|
2012-06-03 11:46:48 +02:00
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
git config remote.origin.url foo &&
|
|
|
|
# actual: fails with an error
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-03 11:46:47 +02:00
|
|
|
test_expect_success '../subrepo works with relative local path - foo/bar' '
|
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
git config remote.origin.url foo/bar &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = foo/subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-06 13:57:30 +02:00
|
|
|
test_expect_success '../subrepo works with relative local path - ./foo' '
|
2012-06-03 11:46:48 +02:00
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
git config remote.origin.url ./foo &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-06 13:57:30 +02:00
|
|
|
test_expect_success '../subrepo works with relative local path - ./foo/bar' '
|
2012-06-03 11:46:48 +02:00
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
git config remote.origin.url ./foo/bar &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = foo/subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-03 11:46:47 +02:00
|
|
|
test_expect_success '../subrepo works with relative local path - ../foo' '
|
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
git config remote.origin.url ../foo &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = ../subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '../subrepo works with relative local path - ../foo/bar' '
|
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
git config remote.origin.url ../foo/bar &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.sub.url)" = ../foo/subrepo
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '../bar/a/b/c works with relative local path - ../foo/bar.git' '
|
|
|
|
(
|
|
|
|
cd reltest &&
|
|
|
|
cp pristine-.git-config .git/config &&
|
|
|
|
cp pristine-.gitmodules .gitmodules &&
|
|
|
|
mkdir -p a/b/c &&
|
|
|
|
(cd a/b/c; git init) &&
|
|
|
|
git config remote.origin.url ../foo/bar.git &&
|
|
|
|
git submodule add ../bar/a/b/c ./a/b/c &&
|
|
|
|
git submodule init &&
|
|
|
|
test "$(git config submodule.a/b/c.url)" = ../foo/bar/a/b/c
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-03-04 22:15:08 +01:00
|
|
|
test_expect_success 'moving the superproject does not break submodules' '
|
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
git submodule status >expect
|
|
|
|
)
|
|
|
|
mv addtest addtest2 &&
|
|
|
|
(
|
|
|
|
cd addtest2 &&
|
|
|
|
git submodule status >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2007-06-02 03:27:42 +02:00
|
|
|
test_done
|