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
|
|
|
|
|
2016-05-05 21:52:32 +02:00
|
|
|
test_expect_success 'submodule deinit works on empty repository' '
|
|
|
|
git submodule deinit --all
|
|
|
|
'
|
|
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2016-04-28 22:02:45 +02:00
|
|
|
test_expect_success 'submodule init aborts on missing .gitmodules file' '
|
|
|
|
test_when_finished "git update-index --remove sub" &&
|
|
|
|
git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
|
|
|
|
# missing the .gitmodules file here
|
|
|
|
test_must_fail git submodule init 2>actual &&
|
|
|
|
test_i18ngrep "No url found for submodule path" actual
|
|
|
|
'
|
|
|
|
|
2016-04-28 22:02:46 +02:00
|
|
|
test_expect_success 'submodule update aborts on missing .gitmodules file' '
|
|
|
|
test_when_finished "git update-index --remove sub" &&
|
|
|
|
git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
|
|
|
|
# missing the .gitmodules file here
|
|
|
|
git submodule update sub 2>actual &&
|
|
|
|
test_i18ngrep "Submodule path .sub. not initialized" actual
|
|
|
|
'
|
|
|
|
|
2017-04-25 02:57:47 +02:00
|
|
|
test_expect_success 'submodule update aborts on missing gitmodules url' '
|
|
|
|
test_when_finished "git update-index --remove sub" &&
|
|
|
|
git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
|
|
|
|
test_when_finished "rm -f .gitmodules" &&
|
|
|
|
git config -f .gitmodules submodule.s.path sub &&
|
|
|
|
test_must_fail git submodule init
|
|
|
|
'
|
|
|
|
|
2019-04-10 01:07:35 +02:00
|
|
|
test_expect_success 'add aborts on repository with no commits' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
'"'repo-no-commits'"' does not have a commit checked out
|
|
|
|
EOF
|
|
|
|
git init repo-no-commits &&
|
|
|
|
test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
|
|
|
|
test_i18ncmp expect actual
|
|
|
|
'
|
|
|
|
|
2020-02-03 00:32:44 +01:00
|
|
|
test_expect_success 'status should ignore inner git repo when not added' '
|
|
|
|
rm -fr inner &&
|
|
|
|
mkdir inner &&
|
|
|
|
(
|
|
|
|
cd inner &&
|
|
|
|
git init &&
|
|
|
|
>t &&
|
|
|
|
git add t &&
|
|
|
|
git commit -m "initial"
|
|
|
|
) &&
|
|
|
|
test_must_fail git submodule status inner 2>output.err &&
|
|
|
|
rm -fr inner &&
|
|
|
|
test_i18ngrep "^error: .*did not match any file(s) known to git" output.err
|
|
|
|
'
|
|
|
|
|
2010-04-10 07:38:37 +02:00
|
|
|
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 &&
|
|
|
|
|
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 &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty 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 &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_empty untracked
|
2009-03-03 16:08:20 +01:00
|
|
|
'
|
|
|
|
|
2018-06-19 01:41:48 +02:00
|
|
|
test_expect_success 'setup parent and one repository' '
|
|
|
|
test_create_repo parent &&
|
|
|
|
test_commit -C parent one
|
|
|
|
'
|
2018-05-03 12:53:45 +02:00
|
|
|
|
|
|
|
test_expect_success 'redirected submodule add does not show progress' '
|
|
|
|
git -C addtest submodule add "file://$submodurl/parent" submod-redirected \
|
|
|
|
2>err &&
|
|
|
|
! grep % err &&
|
|
|
|
test_i18ngrep ! "Checking connectivity" err
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'redirected submodule add --progress does show progress' '
|
|
|
|
git -C addtest submodule add --progress "file://$submodurl/parent" \
|
|
|
|
submod-redirected-progress 2>err && \
|
|
|
|
grep % err
|
|
|
|
'
|
|
|
|
|
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 &&
|
submodule add: show 'add --dry-run' stderr when aborting
Unless --force is specified, 'submodule add' checks if the destination
path is ignored by calling 'git add --dry-run --ignore-missing', and,
if that call fails, aborts with a custom "path is ignored" message (a
slight variant of what 'git add' shows). Aborting early rather than
letting the downstream 'git add' call fail is done so that the command
exits before cloning into the destination path. However, in rare
cases where the dry-run call fails for a reason other than the path
being ignored---for example, due to a preexisting index.lock
file---displaying the "ignored path" error message hides the real
source of the failure.
Instead of displaying the tailored "ignored path" message, let's
report the standard error from the dry run to give the caller more
accurate information about failures that are not due to an ignored
path.
For the ignored path case, this leads to the following change in the
error message:
The following [-path is-]{+paths are+} ignored by one of your .gitignore files:
<destination path>
Use -f if you really want to add [-it.-]{+them.+}
The new phrasing is a bit awkward, because 'submodule add' is only
dealing with one destination path. Alternatively, we could continue
to use the tailored message when the exit code is 1 (the expected
status for a failure due to an ignored path) and relay the standard
error for all other non-zero exits. That, however, risks hiding the
message of unrelated failures that share an exit code of 1, so it
doesn't seem worth doing just to avoid a clunkier, but still clear,
error message.
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-01-08 01:31:21 +01:00
|
|
|
The following paths are ignored by one of your .gitignore files:
|
2010-07-17 17:11:43 +02:00
|
|
|
submod
|
2020-02-14 21:54:19 +01:00
|
|
|
hint: Use -f if you really want to add them.
|
|
|
|
hint: Turn this message off by running
|
|
|
|
hint: "git config advice.addIgnoredFile false"
|
2010-07-17 17:11:43 +02:00
|
|
|
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
|
|
|
'
|
|
|
|
|
2016-10-06 21:37:24 +02:00
|
|
|
test_expect_success 'submodule add to reconfigure existing submodule with --force' '
|
|
|
|
(
|
|
|
|
cd addtest-ignore &&
|
t7400: fix broken "submodule add/reconfigure --force" test
This test has been dysfunctional since it was added by 619acfc78c
(submodule add: extend force flag to add existing repos, 2016-10-06),
however, two problems early in the test went unnoticed due to a broken
&&-chain later in the test.
First, it tries configuring the submodule with repository "bogus-url",
however, "git submodule add" insists that the repository be either an
absolute URL or a relative pathname requiring prefix "./" or "../" (this
is true even with --force), but "bogus-url" does not meet those
criteria, thus the command fails.
Second, it then tries configuring a submodule with a path which is
.gitignore'd, which is disallowed. This restriction can be overridden
with --force, but the test neglects to use that option.
Fix both problems, as well as the broken &&-chain behind which they hid.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-07-02 02:23:51 +02:00
|
|
|
bogus_url="$(pwd)/bogus-url" &&
|
|
|
|
git submodule add --force "$bogus_url" submod &&
|
|
|
|
git submodule add --force -b initial "$submodurl" submod-branch &&
|
|
|
|
test "$bogus_url" = "$(git config -f .gitmodules submodule.submod.url)" &&
|
|
|
|
test "$bogus_url" = "$(git config submodule.submod.url)" &&
|
2016-10-06 21:37:24 +02:00
|
|
|
# Restore the url
|
t7400: fix broken "submodule add/reconfigure --force" test
This test has been dysfunctional since it was added by 619acfc78c
(submodule add: extend force flag to add existing repos, 2016-10-06),
however, two problems early in the test went unnoticed due to a broken
&&-chain later in the test.
First, it tries configuring the submodule with repository "bogus-url",
however, "git submodule add" insists that the repository be either an
absolute URL or a relative pathname requiring prefix "./" or "../" (this
is true even with --force), but "bogus-url" does not meet those
criteria, thus the command fails.
Second, it then tries configuring a submodule with a path which is
.gitignore'd, which is disallowed. This restriction can be overridden
with --force, but the test neglects to use that option.
Fix both problems, as well as the broken &&-chain behind which they hid.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-07-02 02:23:51 +02:00
|
|
|
git submodule add --force "$submodurl" submod &&
|
2016-10-06 21:37:24 +02:00
|
|
|
test "$submodurl" = "$(git config -f .gitmodules submodule.submod.url)" &&
|
|
|
|
test "$submodurl" = "$(git config submodule.submod.url)"
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
submodule add: show 'add --dry-run' stderr when aborting
Unless --force is specified, 'submodule add' checks if the destination
path is ignored by calling 'git add --dry-run --ignore-missing', and,
if that call fails, aborts with a custom "path is ignored" message (a
slight variant of what 'git add' shows). Aborting early rather than
letting the downstream 'git add' call fail is done so that the command
exits before cloning into the destination path. However, in rare
cases where the dry-run call fails for a reason other than the path
being ignored---for example, due to a preexisting index.lock
file---displaying the "ignored path" error message hides the real
source of the failure.
Instead of displaying the tailored "ignored path" message, let's
report the standard error from the dry run to give the caller more
accurate information about failures that are not due to an ignored
path.
For the ignored path case, this leads to the following change in the
error message:
The following [-path is-]{+paths are+} ignored by one of your .gitignore files:
<destination path>
Use -f if you really want to add [-it.-]{+them.+}
The new phrasing is a bit awkward, because 'submodule add' is only
dealing with one destination path. Alternatively, we could continue
to use the tailored message when the exit code is 1 (the expected
status for a failure due to an ignored path) and relay the standard
error for all other non-zero exits. That, however, risks hiding the
message of unrelated failures that share an exit code of 1, so it
doesn't seem worth doing just to avoid a clunkier, but still clear,
error message.
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-01-08 01:31:21 +01:00
|
|
|
test_expect_success 'submodule add relays add --dry-run stderr' '
|
|
|
|
test_when_finished "rm -rf addtest/.git/index.lock" &&
|
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
: >.git/index.lock &&
|
|
|
|
! git submodule add "$submodurl" sub-while-locked 2>output.err &&
|
|
|
|
test_i18ngrep "^fatal: .*index\.lock" output.err &&
|
|
|
|
test_path_is_missing sub-while-locked
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
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
|
|
|
|
|
2009-04-19 05:42:07 +02:00
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
git submodule add -b initial "$submodurl" submod-branch &&
|
2012-12-19 17:03:33 +01:00
|
|
|
test "initial" = "$(git config -f .gitmodules submodule.submod-branch.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 &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_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 &&
|
|
|
|
|
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 &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_empty untracked
|
2009-03-03 16:08:20 +01:00
|
|
|
'
|
|
|
|
|
2015-01-30 16:14:03 +01:00
|
|
|
test_expect_success 'submodule add with /././ in path' '
|
|
|
|
echo "refs/heads/master" >expect &&
|
|
|
|
|
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
git submodule add "$submodurl" dotslashdotsubmod/././frotz/./ &&
|
|
|
|
git submodule init
|
|
|
|
) &&
|
|
|
|
|
|
|
|
rm -f heads head untracked &&
|
|
|
|
inspect addtest/dotslashdotsubmod/frotz ../../.. &&
|
|
|
|
test_cmp expect heads &&
|
|
|
|
test_cmp expect head &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_empty untracked
|
2015-01-30 16:14:03 +01:00
|
|
|
'
|
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 &&
|
|
|
|
|
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 &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_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 &&
|
|
|
|
|
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 &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_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 &&
|
|
|
|
|
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 &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_empty untracked
|
2009-03-03 16:08:20 +01:00
|
|
|
'
|
|
|
|
|
t7400: add !CYGWIN prerequisite to 'add with \\ in path'
Commit cf9e55f494 ("submodule: prevent backslash expantion in submodule
names", 07-04-2017) added a test which creates a git repository with
some backslash characters in the name. On windows, where the backslash
character is a directory separator, it is not possible to create a
repository with the name 'sub\with\backslash'. (The NTFS filesystem would
probably allow it, but the win32 api does not). The MinGW and Git for
Windows versions of git actually create a repository called 'backslash'
in the sub-directory 'sub/with'.
On cygwin, however, due to the slightly schizophrenic treatment of the
backslash character by cygwin-git, this test fails at the 'git init'
stage. The git-init command does not recognise the directory separators
in the input path (eg. is_dir_sep('\\') is false), so it does not
attempt to create the leading directories 'sub/with'. (The call to
mkdir('sub\\with\\backslash') actually does recognise the directory
separators, but fails because the 'sub/with' directory doesn't exist).
In order to suppress the test failure (for now), add the !CYGWIN test
prerequisite.
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-04-30 19:29:30 +02:00
|
|
|
test_expect_success !CYGWIN 'submodule add with \\ in path' '
|
2017-04-07 19:23:06 +02:00
|
|
|
test_when_finished "rm -rf parent sub\\with\\backslash" &&
|
|
|
|
|
|
|
|
# Initialize a repo with a backslash in its name
|
|
|
|
git init sub\\with\\backslash &&
|
|
|
|
touch sub\\with\\backslash/empty.file &&
|
|
|
|
git -C sub\\with\\backslash add empty.file &&
|
|
|
|
git -C sub\\with\\backslash commit -m "Added empty.file" &&
|
|
|
|
|
|
|
|
# Add that repository as a submodule
|
|
|
|
git init parent &&
|
|
|
|
git -C parent submodule add ../sub\\with\\backslash
|
|
|
|
'
|
|
|
|
|
2013-06-16 16:18:18 +02:00
|
|
|
test_expect_success 'submodule add in subdirectory' '
|
|
|
|
echo "refs/heads/master" >expect &&
|
|
|
|
|
|
|
|
mkdir addtest/sub &&
|
|
|
|
(
|
|
|
|
cd addtest/sub &&
|
|
|
|
git submodule add "$submodurl" ../realsubmod3 &&
|
|
|
|
git submodule init
|
|
|
|
) &&
|
|
|
|
|
|
|
|
rm -f heads head untracked &&
|
|
|
|
inspect addtest/realsubmod3 ../.. &&
|
|
|
|
test_cmp expect heads &&
|
|
|
|
test_cmp expect head &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_empty untracked
|
2013-06-16 16:18:18 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'submodule add in subdirectory with relative path should fail' '
|
|
|
|
(
|
|
|
|
cd addtest/sub &&
|
|
|
|
test_must_fail git submodule add ../../ submod3 2>../../output.err
|
|
|
|
) &&
|
|
|
|
test_i18ngrep toplevel output.err
|
|
|
|
'
|
|
|
|
|
2010-04-10 07:39:41 +02:00
|
|
|
test_expect_success 'setup - add an example entry to .gitmodules' '
|
2014-03-21 00:17:01 +01:00
|
|
|
git config --file=.gitmodules submodule.example.url git://example.com/init.git
|
2010-04-10 07:39:41 +02:00
|
|
|
'
|
|
|
|
|
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
|
|
|
|
|
2014-03-21 00:17:01 +01:00
|
|
|
git config --file=.gitmodules submodule.example.path init &&
|
2010-04-10 07:39:41 +02:00
|
|
|
|
|
|
|
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
|
|
|
'
|
|
|
|
|
2019-11-25 05:15:44 +01:00
|
|
|
test_expect_success 'status from subdirectory should have the same SHA1' '
|
|
|
|
test_when_finished "rmdir addtest/subdir" &&
|
|
|
|
(
|
|
|
|
cd addtest &&
|
|
|
|
mkdir subdir &&
|
|
|
|
git submodule status >output &&
|
|
|
|
awk "{print \$1}" <output >expect &&
|
|
|
|
cd subdir &&
|
|
|
|
git submodule status >../output &&
|
|
|
|
awk "{print \$1}" <../output >../actual &&
|
|
|
|
test_cmp ../expect ../actual &&
|
|
|
|
git -C ../submod checkout HEAD^ &&
|
|
|
|
git submodule status >../output &&
|
|
|
|
awk "{print \$1}" <../output >../actual2 &&
|
|
|
|
cd .. &&
|
|
|
|
git submodule status >output &&
|
|
|
|
awk "{print \$1}" <output >expect2 &&
|
|
|
|
test_cmp expect2 actual2 &&
|
|
|
|
! test_cmp actual actual2
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
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
|
|
|
'
|
|
|
|
|
2020-01-24 11:34:04 +01:00
|
|
|
test_expect_success 'status should still be "missing" after initializing' '
|
2020-01-24 11:34:03 +01:00
|
|
|
rm -fr init &&
|
|
|
|
mkdir init &&
|
|
|
|
git submodule status >lines &&
|
|
|
|
rm -fr init &&
|
|
|
|
grep "^-$rev1" lines
|
|
|
|
'
|
|
|
|
|
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 &&
|
2018-07-21 09:49:30 +02:00
|
|
|
test_i18ngrep "^error: .*no-such-submodule" output.err
|
2012-08-14 22:35:27 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
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 &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty 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
|
|
|
'
|
|
|
|
|
2013-06-16 16:18:18 +02:00
|
|
|
test_expect_success 'status "up-to-date" from subdirectory' '
|
|
|
|
mkdir -p sub &&
|
|
|
|
(
|
|
|
|
cd sub &&
|
|
|
|
git submodule status >../list
|
|
|
|
) &&
|
|
|
|
grep "^ $rev1" list &&
|
|
|
|
grep "\\.\\./init" list
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'status "up-to-date" from subdirectory with path' '
|
|
|
|
mkdir -p sub &&
|
|
|
|
(
|
|
|
|
cd sub &&
|
|
|
|
git submodule status ../init >../list
|
|
|
|
) &&
|
|
|
|
grep "^ $rev1" list &&
|
|
|
|
grep "\\.\\./init" 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' '
|
|
|
|
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 &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_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 &&
|
|
|
|
|
2016-03-01 03:07:14 +01:00
|
|
|
git submodule update init 2> 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
|
|
|
'
|
|
|
|
|
2013-06-16 16:18:18 +02:00
|
|
|
test_expect_success 'update --init from subdirectory' '
|
|
|
|
mv init init2 &&
|
|
|
|
git config -f .gitmodules submodule.example.url "$(pwd)/init2" &&
|
|
|
|
git config --remove-section submodule.example &&
|
|
|
|
test_must_fail git config submodule.example.url &&
|
|
|
|
|
|
|
|
mkdir -p sub &&
|
|
|
|
(
|
|
|
|
cd sub &&
|
2016-03-01 03:07:14 +01:00
|
|
|
git submodule update ../init 2>update.out &&
|
2013-06-16 16:18:18 +02:00
|
|
|
test_i18ngrep "not initialized" update.out &&
|
|
|
|
test_must_fail git rev-parse --resolve-git-dir ../init/.git &&
|
|
|
|
|
|
|
|
git submodule update --init ../init
|
|
|
|
) &&
|
|
|
|
git rev-parse --resolve-git-dir init/.git
|
|
|
|
'
|
|
|
|
|
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
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2013-09-12 21:25:01 +02:00
|
|
|
test_expect_success 'gracefully add/reset submodule with a trailing slash' '
|
2009-01-02 19:08:40 +01:00
|
|
|
|
|
|
|
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 |
|
2013-09-12 21:25:01 +02:00
|
|
|
sed -n "s/^160000 \([^ ]*\).*/\1/p") &&
|
|
|
|
git reset init/ &&
|
|
|
|
git diff --exit-code --cached init
|
2009-01-02 19:08:40 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2012-09-22 13:27:59 +02:00
|
|
|
test_expect_success 'submodule <invalid-subcommand> fails' '
|
|
|
|
test_must_fail git submodule no-such-subcommand
|
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 &&
|
2019-04-10 01:07:35 +02:00
|
|
|
(cd a/b/c && git init && test_commit msg) &&
|
2012-06-03 11:46:47 +02:00
|
|
|
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
|
2015-03-20 11:07:15 +01:00
|
|
|
) &&
|
2012-03-04 22:15:08 +01:00
|
|
|
mv addtest addtest2 &&
|
|
|
|
(
|
|
|
|
cd addtest2 &&
|
|
|
|
git submodule status >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2018-03-28 23:14:08 +02:00
|
|
|
test_expect_success 'moving the submodule does not break the superproject' '
|
|
|
|
(
|
|
|
|
cd addtest2 &&
|
|
|
|
git submodule status
|
|
|
|
) >actual &&
|
|
|
|
sed -e "s/^ \([^ ]* repo\) .*/-\1/" <actual >expect &&
|
|
|
|
mv addtest2/repo addtest2/repo.bak &&
|
|
|
|
test_when_finished "mv addtest2/repo.bak addtest2/repo" &&
|
|
|
|
(
|
|
|
|
cd addtest2 &&
|
|
|
|
git submodule status
|
|
|
|
) >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2012-09-30 01:05:58 +02:00
|
|
|
test_expect_success 'submodule add --name allows to replace a submodule with another at the same path' '
|
|
|
|
(
|
|
|
|
cd addtest2 &&
|
|
|
|
(
|
|
|
|
cd repo &&
|
|
|
|
echo "$submodurl/repo" >expect &&
|
|
|
|
git config remote.origin.url >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
echo "gitdir: ../.git/modules/repo" >expect &&
|
|
|
|
test_cmp expect .git
|
|
|
|
) &&
|
|
|
|
rm -rf repo &&
|
|
|
|
git rm repo &&
|
|
|
|
git submodule add -q --name repo_new "$submodurl/bare.git" repo >actual &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty actual &&
|
2012-09-30 01:05:58 +02:00
|
|
|
echo "gitdir: ../.git/modules/submod" >expect &&
|
|
|
|
test_cmp expect submod/.git &&
|
|
|
|
(
|
|
|
|
cd repo &&
|
|
|
|
echo "$submodurl/bare.git" >expect &&
|
|
|
|
git config remote.origin.url >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
echo "gitdir: ../.git/modules/repo_new" >expect &&
|
|
|
|
test_cmp expect .git
|
|
|
|
) &&
|
|
|
|
echo "repo" >expect &&
|
2013-08-06 21:15:25 +02:00
|
|
|
test_must_fail git config -f .gitmodules submodule.repo.path &&
|
2012-09-30 01:05:58 +02:00
|
|
|
git config -f .gitmodules submodule.repo_new.path >actual &&
|
2020-03-22 22:14:22 +01:00
|
|
|
test_cmp expect actual &&
|
2012-09-30 01:05:58 +02:00
|
|
|
echo "$submodurl/repo" >expect &&
|
2013-08-06 21:15:25 +02:00
|
|
|
test_must_fail git config -f .gitmodules submodule.repo.url &&
|
2012-09-30 01:05:58 +02:00
|
|
|
echo "$submodurl/bare.git" >expect &&
|
|
|
|
git config -f .gitmodules submodule.repo_new.url >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
echo "$submodurl/repo" >expect &&
|
|
|
|
git config submodule.repo.url >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
echo "$submodurl/bare.git" >expect &&
|
|
|
|
git config submodule.repo_new.url >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2016-04-01 02:17:28 +02:00
|
|
|
test_expect_success 'recursive relative submodules stay relative' '
|
2016-03-31 23:04:36 +02:00
|
|
|
test_when_finished "rm -rf super clone2 subsub sub3" &&
|
|
|
|
mkdir subsub &&
|
|
|
|
(
|
|
|
|
cd subsub &&
|
|
|
|
git init &&
|
|
|
|
>t &&
|
|
|
|
git add t &&
|
|
|
|
git commit -m "initial commit"
|
|
|
|
) &&
|
|
|
|
mkdir sub3 &&
|
|
|
|
(
|
|
|
|
cd sub3 &&
|
|
|
|
git init &&
|
|
|
|
>t &&
|
|
|
|
git add t &&
|
|
|
|
git commit -m "initial commit" &&
|
|
|
|
git submodule add ../subsub dirdir/subsub &&
|
|
|
|
git commit -m "add submodule subsub"
|
|
|
|
) &&
|
|
|
|
mkdir super &&
|
|
|
|
(
|
|
|
|
cd super &&
|
|
|
|
git init &&
|
|
|
|
>t &&
|
|
|
|
git add t &&
|
|
|
|
git commit -m "initial commit" &&
|
|
|
|
git submodule add ../sub3 &&
|
|
|
|
git commit -m "add submodule sub"
|
|
|
|
) &&
|
|
|
|
git clone super clone2 &&
|
|
|
|
(
|
|
|
|
cd clone2 &&
|
|
|
|
git submodule update --init --recursive &&
|
|
|
|
echo "gitdir: ../.git/modules/sub3" >./sub3/.git_expect &&
|
|
|
|
echo "gitdir: ../../../.git/modules/sub3/modules/dirdir/subsub" >./sub3/dirdir/subsub/.git_expect
|
|
|
|
) &&
|
|
|
|
test_cmp clone2/sub3/.git_expect clone2/sub3/.git &&
|
|
|
|
test_cmp clone2/sub3/dirdir/subsub/.git_expect clone2/sub3/dirdir/subsub/.git
|
2012-09-30 01:05:58 +02:00
|
|
|
'
|
|
|
|
|
2012-09-30 23:01:29 +02:00
|
|
|
test_expect_success 'submodule add with an existing name fails unless forced' '
|
|
|
|
(
|
|
|
|
cd addtest2 &&
|
|
|
|
rm -rf repo &&
|
|
|
|
git rm repo &&
|
|
|
|
test_must_fail git submodule add -q --name repo_new "$submodurl/repo.git" repo &&
|
|
|
|
test ! -d repo &&
|
2013-08-06 21:15:25 +02:00
|
|
|
test_must_fail git config -f .gitmodules submodule.repo_new.path &&
|
|
|
|
test_must_fail git config -f .gitmodules submodule.repo_new.url &&
|
2012-09-30 23:01:29 +02:00
|
|
|
echo "$submodurl/bare.git" >expect &&
|
|
|
|
git config submodule.repo_new.url >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git submodule add -f -q --name repo_new "$submodurl/repo.git" repo &&
|
|
|
|
test -d repo &&
|
|
|
|
echo "repo" >expect &&
|
|
|
|
git config -f .gitmodules submodule.repo_new.path >actual &&
|
2020-03-22 22:14:22 +01:00
|
|
|
test_cmp expect actual &&
|
2012-09-30 23:01:29 +02:00
|
|
|
echo "$submodurl/repo.git" >expect &&
|
|
|
|
git config -f .gitmodules submodule.repo_new.url >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
echo "$submodurl/repo.git" >expect &&
|
|
|
|
git config submodule.repo_new.url >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-03-04 22:20:24 +01:00
|
|
|
test_expect_success 'set up a second submodule' '
|
|
|
|
git submodule add ./init2 example2 &&
|
|
|
|
git commit -m "submodule example2 added"
|
|
|
|
'
|
|
|
|
|
submodule: fix regression for deinit without submodules
Per Cederqvist wrote:
> It used to be possible to run
>
> git submodule deinit -f .
>
> to remove any submodules, no matter how many submodules you had. That
> is no longer possible in projects that don't have any submodules at
> all. The command will fail with:
>
> error: pathspec '.' did not match any file(s) known to git.
This regression was introduced in 74703a1e4dfc (submodule: rewrite
`module_list` shell function in C, 2015-09-02), as we changed the
order of checking in new module listing to first check whether it is
a gitlin before feeding it to match_pathspec(). It used to be that
a pathspec that does not match any path were diagnosed as an error,
but the new code complains for a pathspec that does not match any
submodule path.
Arguably the new behaviour may give us a better diagnosis, but that
is inconsistent with the suggestion "deinit" gives, and also this
was an unintended accident. The new behaviour hopefully can be
redesigned and implemented better in future releases, but for now,
switch these two checks to restore the same behavior as before. In
an empty repository, giving the pathspec '.' will still get the same
"did not match" error, but that is the same bug we had before 1.7.0.
Reported-by: Per Cederqvist <cederp@opera.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-23 00:42:14 +01:00
|
|
|
test_expect_success 'submodule deinit works on repository without submodules' '
|
|
|
|
test_when_finished "rm -rf newdirectory" &&
|
|
|
|
mkdir newdirectory &&
|
|
|
|
(
|
|
|
|
cd newdirectory &&
|
|
|
|
git init &&
|
|
|
|
>file &&
|
|
|
|
git add file &&
|
2016-05-03 00:24:02 +02:00
|
|
|
git commit -m "repo should not be empty" &&
|
2016-05-05 21:52:32 +02:00
|
|
|
git submodule deinit . &&
|
|
|
|
git submodule deinit --all
|
submodule: fix regression for deinit without submodules
Per Cederqvist wrote:
> It used to be possible to run
>
> git submodule deinit -f .
>
> to remove any submodules, no matter how many submodules you had. That
> is no longer possible in projects that don't have any submodules at
> all. The command will fail with:
>
> error: pathspec '.' did not match any file(s) known to git.
This regression was introduced in 74703a1e4dfc (submodule: rewrite
`module_list` shell function in C, 2015-09-02), as we changed the
order of checking in new module listing to first check whether it is
a gitlin before feeding it to match_pathspec(). It used to be that
a pathspec that does not match any path were diagnosed as an error,
but the new code complains for a pathspec that does not match any
submodule path.
Arguably the new behaviour may give us a better diagnosis, but that
is inconsistent with the suggestion "deinit" gives, and also this
was an unintended accident. The new behaviour hopefully can be
redesigned and implemented better in future releases, but for now,
switch these two checks to restore the same behavior as before. In
an empty repository, giving the pathspec '.' will still get the same
"did not match" error, but that is the same bug we had before 1.7.0.
Reported-by: Per Cederqvist <cederp@opera.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-23 00:42:14 +01:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-03-04 22:20:24 +01:00
|
|
|
test_expect_success 'submodule deinit should remove the whole submodule section from .git/config' '
|
|
|
|
git config submodule.example.foo bar &&
|
|
|
|
git config submodule.example2.frotz nitfol &&
|
|
|
|
git submodule deinit init &&
|
|
|
|
test -z "$(git config --get-regexp "submodule\.example\.")" &&
|
|
|
|
test -n "$(git config --get-regexp "submodule\.example2\.")" &&
|
|
|
|
test -f example2/.git &&
|
|
|
|
rmdir init
|
|
|
|
'
|
|
|
|
|
submodule deinit: unset core.worktree
When a submodule is deinit'd, the working tree is gone, so the setting of
core.worktree is bogus. Unset it. As we covered the only other case in
which a submodule loses its working tree in the earlier step
(i.e. switching branches of top-level project to move to a commit that did
not have the submodule), this makes the code always maintain
core.worktree correctly unset when there is no working tree
for a submodule.
This re-introduces 984cd77ddb (submodule deinit: unset core.worktree,
2018-06-18), which was reverted as part of f178c13fda (Revert "Merge
branch 'sb/submodule-core-worktree'", 2018-09-07)
The whole series was reverted as the offending commit e98317508c
(submodule: ensure core.worktree is set after update, 2018-06-18)
was relied on by other commits such as 984cd77ddb.
Keep the offending commit reverted, but its functionality came back via
4d6d6ef1fc (Merge branch 'sb/submodule-update-in-c', 2018-09-17), such
that we can reintroduce 984cd77ddb now.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-12-15 00:59:45 +01:00
|
|
|
test_expect_success 'submodule deinit should unset core.worktree' '
|
|
|
|
test_path_is_file .git/modules/example/config &&
|
|
|
|
test_must_fail git config -f .git/modules/example/config core.worktree
|
|
|
|
'
|
|
|
|
|
2013-06-16 16:18:18 +02:00
|
|
|
test_expect_success 'submodule deinit from subdirectory' '
|
|
|
|
git submodule update --init &&
|
|
|
|
git config submodule.example.foo bar &&
|
|
|
|
mkdir -p sub &&
|
|
|
|
(
|
|
|
|
cd sub &&
|
|
|
|
git submodule deinit ../init >../output
|
|
|
|
) &&
|
2016-06-17 22:21:07 +02:00
|
|
|
test_i18ngrep "\\.\\./init" output &&
|
2013-06-16 16:18:18 +02:00
|
|
|
test -z "$(git config --get-regexp "submodule\.example\.")" &&
|
|
|
|
test -n "$(git config --get-regexp "submodule\.example2\.")" &&
|
|
|
|
test -f example2/.git &&
|
|
|
|
rmdir init
|
|
|
|
'
|
|
|
|
|
2013-03-04 22:20:24 +01:00
|
|
|
test_expect_success 'submodule deinit . deinits all initialized submodules' '
|
|
|
|
git submodule update --init &&
|
|
|
|
git config submodule.example.foo bar &&
|
|
|
|
git config submodule.example2.frotz nitfol &&
|
|
|
|
test_must_fail git submodule deinit &&
|
2013-04-01 21:02:00 +02:00
|
|
|
git submodule deinit . >actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
test -z "$(git config --get-regexp "submodule\.example\.")" &&
|
|
|
|
test -z "$(git config --get-regexp "submodule\.example2\.")" &&
|
2013-04-01 21:02:00 +02:00
|
|
|
test_i18ngrep "Cleared directory .init" actual &&
|
|
|
|
test_i18ngrep "Cleared directory .example2" actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
rmdir init example2
|
|
|
|
'
|
|
|
|
|
2016-05-05 21:52:32 +02:00
|
|
|
test_expect_success 'submodule deinit --all deinits all initialized submodules' '
|
|
|
|
git submodule update --init &&
|
|
|
|
git config submodule.example.foo bar &&
|
|
|
|
git config submodule.example2.frotz nitfol &&
|
|
|
|
test_must_fail git submodule deinit &&
|
|
|
|
git submodule deinit --all >actual &&
|
|
|
|
test -z "$(git config --get-regexp "submodule\.example\.")" &&
|
|
|
|
test -z "$(git config --get-regexp "submodule\.example2\.")" &&
|
|
|
|
test_i18ngrep "Cleared directory .init" actual &&
|
|
|
|
test_i18ngrep "Cleared directory .example2" actual &&
|
|
|
|
rmdir init example2
|
|
|
|
'
|
|
|
|
|
2013-03-04 22:20:24 +01:00
|
|
|
test_expect_success 'submodule deinit deinits a submodule when its work tree is missing or empty' '
|
|
|
|
git submodule update --init &&
|
|
|
|
rm -rf init example2/* example2/.git &&
|
2013-04-01 21:02:00 +02:00
|
|
|
git submodule deinit init example2 >actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
test -z "$(git config --get-regexp "submodule\.example\.")" &&
|
|
|
|
test -z "$(git config --get-regexp "submodule\.example2\.")" &&
|
2013-04-01 21:02:00 +02:00
|
|
|
test_i18ngrep ! "Cleared directory .init" actual &&
|
|
|
|
test_i18ngrep "Cleared directory .example2" actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
rmdir init
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'submodule deinit fails when the submodule contains modifications unless forced' '
|
|
|
|
git submodule update --init &&
|
|
|
|
echo X >>init/s &&
|
|
|
|
test_must_fail git submodule deinit init &&
|
|
|
|
test -n "$(git config --get-regexp "submodule\.example\.")" &&
|
|
|
|
test -f example2/.git &&
|
2013-04-01 21:02:00 +02:00
|
|
|
git submodule deinit -f init >actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
test -z "$(git config --get-regexp "submodule\.example\.")" &&
|
2013-04-01 21:02:00 +02:00
|
|
|
test_i18ngrep "Cleared directory .init" actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
rmdir init
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'submodule deinit fails when the submodule contains untracked files unless forced' '
|
|
|
|
git submodule update --init &&
|
|
|
|
echo X >>init/untracked &&
|
|
|
|
test_must_fail git submodule deinit init &&
|
|
|
|
test -n "$(git config --get-regexp "submodule\.example\.")" &&
|
|
|
|
test -f example2/.git &&
|
2013-04-01 21:02:00 +02:00
|
|
|
git submodule deinit -f init >actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
test -z "$(git config --get-regexp "submodule\.example\.")" &&
|
2013-04-01 21:02:00 +02:00
|
|
|
test_i18ngrep "Cleared directory .init" actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
rmdir init
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'submodule deinit fails when the submodule HEAD does not match unless forced' '
|
|
|
|
git submodule update --init &&
|
|
|
|
(
|
|
|
|
cd init &&
|
|
|
|
git checkout HEAD^
|
|
|
|
) &&
|
|
|
|
test_must_fail git submodule deinit init &&
|
|
|
|
test -n "$(git config --get-regexp "submodule\.example\.")" &&
|
|
|
|
test -f example2/.git &&
|
2013-04-01 21:02:00 +02:00
|
|
|
git submodule deinit -f init >actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
test -z "$(git config --get-regexp "submodule\.example\.")" &&
|
2013-04-01 21:02:00 +02:00
|
|
|
test_i18ngrep "Cleared directory .init" actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
rmdir init
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'submodule deinit is silent when used on an uninitialized submodule' '
|
|
|
|
git submodule update --init &&
|
|
|
|
git submodule deinit init >actual &&
|
|
|
|
test_i18ngrep "Submodule .example. (.*) unregistered for path .init" actual &&
|
2013-04-01 21:02:00 +02:00
|
|
|
test_i18ngrep "Cleared directory .init" actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
git submodule deinit init >actual &&
|
|
|
|
test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
|
2013-04-01 21:02:00 +02:00
|
|
|
test_i18ngrep "Cleared directory .init" actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
git submodule deinit . >actual &&
|
|
|
|
test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
|
|
|
|
test_i18ngrep "Submodule .example2. (.*) unregistered for path .example2" actual &&
|
2013-04-01 21:02:00 +02:00
|
|
|
test_i18ngrep "Cleared directory .init" actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
git submodule deinit . >actual &&
|
|
|
|
test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
|
|
|
|
test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
|
2013-04-01 21:02:00 +02:00
|
|
|
test_i18ngrep "Cleared directory .init" actual &&
|
2016-05-05 21:52:32 +02:00
|
|
|
git submodule deinit --all >actual &&
|
|
|
|
test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
|
|
|
|
test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
|
|
|
|
test_i18ngrep "Cleared directory .init" actual &&
|
2013-03-04 22:20:24 +01:00
|
|
|
rmdir init example2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'submodule deinit fails when submodule has a .git directory even when forced' '
|
|
|
|
git submodule update --init &&
|
|
|
|
(
|
|
|
|
cd init &&
|
|
|
|
rm .git &&
|
|
|
|
cp -R ../.git/modules/example .git &&
|
|
|
|
GIT_WORK_TREE=. git config --unset core.worktree
|
|
|
|
) &&
|
|
|
|
test_must_fail git submodule deinit init &&
|
|
|
|
test_must_fail git submodule deinit -f init &&
|
|
|
|
test -d init/.git &&
|
|
|
|
test -n "$(git config --get-regexp "submodule\.example\.")"
|
|
|
|
'
|
|
|
|
|
2013-06-20 16:58:48 +02:00
|
|
|
test_expect_success 'submodule with UTF-8 name' '
|
|
|
|
svname=$(printf "\303\245 \303\244\303\266") &&
|
|
|
|
mkdir "$svname" &&
|
2013-06-14 02:26:02 +02:00
|
|
|
(
|
2013-06-20 16:58:48 +02:00
|
|
|
cd "$svname" &&
|
2013-06-14 02:26:02 +02:00
|
|
|
git init &&
|
2013-06-20 16:58:48 +02:00
|
|
|
>sub &&
|
|
|
|
git add sub &&
|
2013-06-14 02:26:02 +02:00
|
|
|
git commit -m "init sub"
|
2013-06-20 16:58:48 +02:00
|
|
|
) &&
|
|
|
|
git submodule add ./"$svname" &&
|
|
|
|
git submodule >&2 &&
|
|
|
|
test -n "$(git submodule | grep "$svname")"
|
2013-06-14 02:26:02 +02:00
|
|
|
'
|
2013-07-15 19:28:48 +02:00
|
|
|
|
2013-07-02 23:42:56 +02:00
|
|
|
test_expect_success 'submodule add clone shallow submodule' '
|
|
|
|
mkdir super &&
|
2015-03-20 11:07:15 +01:00
|
|
|
pwd=$(pwd) &&
|
2013-07-02 23:42:56 +02:00
|
|
|
(
|
|
|
|
cd super &&
|
|
|
|
git init &&
|
|
|
|
git submodule add --depth=1 file://"$pwd"/example2 submodule &&
|
|
|
|
(
|
|
|
|
cd submodule &&
|
|
|
|
test 1 = $(git log --oneline | wc -l)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2016-02-24 22:15:02 +01:00
|
|
|
test_expect_success 'submodule helper list is not confused by common prefixes' '
|
|
|
|
mkdir -p dir1/b &&
|
|
|
|
(
|
|
|
|
cd dir1/b &&
|
|
|
|
git init &&
|
|
|
|
echo hi >testfile2 &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m "test1"
|
|
|
|
) &&
|
|
|
|
mkdir -p dir2/b &&
|
|
|
|
(
|
|
|
|
cd dir2/b &&
|
|
|
|
git init &&
|
|
|
|
echo hello >testfile1 &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m "test2"
|
|
|
|
) &&
|
|
|
|
git submodule add /dir1/b dir1/b &&
|
|
|
|
git submodule add /dir2/b dir2/b &&
|
|
|
|
git commit -m "first submodule commit" &&
|
2020-07-30 01:14:03 +02:00
|
|
|
git submodule--helper list dir1/b | cut -f 2 >actual &&
|
2016-02-24 22:15:02 +01:00
|
|
|
echo "dir1/b" >expect &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2017-03-17 23:38:02 +01:00
|
|
|
test_expect_success 'setup superproject with submodules' '
|
|
|
|
git init sub1 &&
|
|
|
|
test_commit -C sub1 test &&
|
|
|
|
test_commit -C sub1 test2 &&
|
|
|
|
git init multisuper &&
|
|
|
|
git -C multisuper submodule add ../sub1 sub0 &&
|
|
|
|
git -C multisuper submodule add ../sub1 sub1 &&
|
|
|
|
git -C multisuper submodule add ../sub1 sub2 &&
|
|
|
|
git -C multisuper submodule add ../sub1 sub3 &&
|
|
|
|
git -C multisuper commit -m "add some submodules"
|
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<-EOF
|
|
|
|
-sub0
|
|
|
|
sub1 (test2)
|
|
|
|
sub2 (test2)
|
|
|
|
sub3 (test2)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'submodule update --init with a specification' '
|
|
|
|
test_when_finished "rm -rf multisuper_clone" &&
|
|
|
|
pwd=$(pwd) &&
|
|
|
|
git clone file://"$pwd"/multisuper multisuper_clone &&
|
|
|
|
git -C multisuper_clone submodule update --init . ":(exclude)sub0" &&
|
2020-07-30 01:14:03 +02:00
|
|
|
git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
|
2017-03-17 23:38:02 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'submodule update --init with submodule.active set' '
|
|
|
|
test_when_finished "rm -rf multisuper_clone" &&
|
|
|
|
pwd=$(pwd) &&
|
|
|
|
git clone file://"$pwd"/multisuper multisuper_clone &&
|
|
|
|
git -C multisuper_clone config submodule.active "." &&
|
|
|
|
git -C multisuper_clone config --add submodule.active ":(exclude)sub0" &&
|
|
|
|
git -C multisuper_clone submodule update --init &&
|
2020-07-30 01:14:03 +02:00
|
|
|
git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
|
2017-03-17 23:38:02 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'submodule update and setting submodule.<name>.active' '
|
|
|
|
test_when_finished "rm -rf multisuper_clone" &&
|
|
|
|
pwd=$(pwd) &&
|
|
|
|
git clone file://"$pwd"/multisuper multisuper_clone &&
|
|
|
|
git -C multisuper_clone config --bool submodule.sub0.active "true" &&
|
|
|
|
git -C multisuper_clone config --bool submodule.sub1.active "false" &&
|
|
|
|
git -C multisuper_clone config --bool submodule.sub2.active "true" &&
|
|
|
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
sub0 (test2)
|
|
|
|
-sub1
|
|
|
|
sub2 (test2)
|
|
|
|
-sub3
|
|
|
|
EOF
|
|
|
|
git -C multisuper_clone submodule update &&
|
2020-07-30 01:14:03 +02:00
|
|
|
git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
|
2017-03-17 23:38:02 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2013-07-02 23:42:56 +02:00
|
|
|
|
2018-10-16 19:27:03 +02:00
|
|
|
test_expect_success 'clone active submodule without submodule url set' '
|
|
|
|
test_when_finished "rm -rf test/test" &&
|
|
|
|
mkdir test &&
|
|
|
|
# another dir breaks accidental relative paths still being correct
|
|
|
|
git clone file://"$pwd"/multisuper test/test &&
|
|
|
|
(
|
|
|
|
cd test/test &&
|
|
|
|
git config submodule.active "." &&
|
|
|
|
|
|
|
|
# do not pass --init flag, as the submodule is already active:
|
|
|
|
git submodule update &&
|
|
|
|
git submodule status >actual_raw &&
|
|
|
|
|
2020-07-30 01:14:03 +02:00
|
|
|
cut -d" " -f3- actual_raw >actual &&
|
2018-10-16 19:27:03 +02:00
|
|
|
cat >expect <<-\EOF &&
|
2020-07-30 01:14:03 +02:00
|
|
|
sub0 (test2)
|
|
|
|
sub1 (test2)
|
|
|
|
sub2 (test2)
|
|
|
|
sub3 (test2)
|
2018-10-16 19:27:03 +02:00
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2017-03-17 23:38:03 +01:00
|
|
|
test_expect_success 'clone --recurse-submodules with a pathspec works' '
|
|
|
|
test_when_finished "rm -rf multisuper_clone" &&
|
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
sub0 (test2)
|
|
|
|
-sub1
|
|
|
|
-sub2
|
|
|
|
-sub3
|
|
|
|
EOF
|
|
|
|
|
|
|
|
git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
|
2020-07-30 01:14:03 +02:00
|
|
|
git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
|
2017-10-06 21:00:06 +02:00
|
|
|
test_cmp expected actual
|
2017-03-17 23:38:03 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'clone with multiple --recurse-submodules options' '
|
|
|
|
test_when_finished "rm -rf multisuper_clone" &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
-sub0
|
|
|
|
sub1 (test2)
|
|
|
|
-sub2
|
|
|
|
sub3 (test2)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
git clone --recurse-submodules="." \
|
|
|
|
--recurse-submodules=":(exclude)sub0" \
|
|
|
|
--recurse-submodules=":(exclude)sub2" \
|
|
|
|
multisuper multisuper_clone &&
|
2020-07-30 01:14:03 +02:00
|
|
|
git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
|
2017-03-17 23:38:03 +01:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'clone and subsequent updates correctly auto-initialize submodules' '
|
|
|
|
test_when_finished "rm -rf multisuper_clone" &&
|
|
|
|
cat <<-\EOF >expect &&
|
|
|
|
-sub0
|
|
|
|
sub1 (test2)
|
|
|
|
-sub2
|
|
|
|
sub3 (test2)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat <<-\EOF >expect2 &&
|
|
|
|
-sub0
|
|
|
|
sub1 (test2)
|
|
|
|
-sub2
|
|
|
|
sub3 (test2)
|
|
|
|
-sub4
|
|
|
|
sub5 (test2)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
git clone --recurse-submodules="." \
|
|
|
|
--recurse-submodules=":(exclude)sub0" \
|
|
|
|
--recurse-submodules=":(exclude)sub2" \
|
|
|
|
--recurse-submodules=":(exclude)sub4" \
|
|
|
|
multisuper multisuper_clone &&
|
|
|
|
|
2020-07-30 01:14:03 +02:00
|
|
|
git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
|
2017-03-17 23:38:03 +01:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
git -C multisuper submodule add ../sub1 sub4 &&
|
|
|
|
git -C multisuper submodule add ../sub1 sub5 &&
|
|
|
|
git -C multisuper commit -m "add more submodules" &&
|
|
|
|
# obtain the new superproject
|
|
|
|
git -C multisuper_clone pull &&
|
|
|
|
git -C multisuper_clone submodule update --init &&
|
2020-07-30 01:14:03 +02:00
|
|
|
git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
|
2017-03-17 23:38:03 +01:00
|
|
|
test_cmp expect2 actual
|
|
|
|
'
|
|
|
|
|
2017-03-17 23:38:04 +01:00
|
|
|
test_expect_success 'init properly sets the config' '
|
|
|
|
test_when_finished "rm -rf multisuper_clone" &&
|
|
|
|
git clone --recurse-submodules="." \
|
|
|
|
--recurse-submodules=":(exclude)sub0" \
|
|
|
|
multisuper multisuper_clone &&
|
|
|
|
|
|
|
|
git -C multisuper_clone submodule init -- sub0 sub1 &&
|
|
|
|
git -C multisuper_clone config --get submodule.sub0.active &&
|
|
|
|
test_must_fail git -C multisuper_clone config --get submodule.sub1.active
|
|
|
|
'
|
|
|
|
|
2017-08-04 00:25:44 +02:00
|
|
|
test_expect_success 'recursive clone respects -q' '
|
|
|
|
test_when_finished "rm -rf multisuper_clone" &&
|
|
|
|
git clone -q --recurse-submodules multisuper multisuper_clone >actual &&
|
|
|
|
test_must_be_empty actual
|
|
|
|
'
|
|
|
|
|
2007-06-02 03:27:42 +02:00
|
|
|
test_done
|