mirror of
https://github.com/git/git
synced 2024-09-13 05:14:36 +00:00
1edbaac3bb
The test functions test_i18ncmp and test_i18ngrep pretend success if run under GETTEXT_POISON. By using those functions to test output which is correctly marked as translatable, enables one to detect if the strings newly marked for translation are from plumbing output. If they are indeed from plumbing, the test would fail, and the string should be unmarked, since it is not seen by users. Thus, it is productive to not have false positives when running the test under GETTEXT_POISON. This commit replaces normal test functions by their i18n aware variants in use-cases know to be correctly marked for translation, suppressing false positives. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
351 lines
7.3 KiB
Bash
Executable file
351 lines
7.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2008 David Aguilar
|
|
#
|
|
|
|
test_description='git submodule sync
|
|
|
|
These tests exercise the "git submodule sync" subcommand.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo file >file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m upstream &&
|
|
git clone . super &&
|
|
git clone super submodule &&
|
|
(
|
|
cd submodule &&
|
|
git submodule add ../submodule sub-submodule &&
|
|
test_tick &&
|
|
git commit -m "sub-submodule"
|
|
) &&
|
|
(
|
|
cd super &&
|
|
git submodule add ../submodule submodule &&
|
|
test_tick &&
|
|
git commit -m "submodule"
|
|
) &&
|
|
git clone super super-clone &&
|
|
(
|
|
cd super-clone &&
|
|
git submodule update --init --recursive
|
|
) &&
|
|
git clone super empty-clone &&
|
|
(
|
|
cd empty-clone &&
|
|
git submodule init
|
|
) &&
|
|
git clone super top-only-clone &&
|
|
git clone super relative-clone &&
|
|
(
|
|
cd relative-clone &&
|
|
git submodule update --init --recursive
|
|
) &&
|
|
git clone super recursive-clone &&
|
|
(
|
|
cd recursive-clone &&
|
|
git submodule update --init --recursive
|
|
)
|
|
'
|
|
|
|
test_expect_success 'change submodule' '
|
|
(
|
|
cd submodule &&
|
|
echo second line >>file &&
|
|
test_tick &&
|
|
git commit -a -m "change submodule"
|
|
)
|
|
'
|
|
|
|
reset_submodule_urls () {
|
|
local root
|
|
root=$(pwd) &&
|
|
(
|
|
cd super-clone/submodule &&
|
|
git config remote.origin.url "$root/submodule"
|
|
) &&
|
|
(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git config remote.origin.url "$root/submodule"
|
|
)
|
|
}
|
|
|
|
test_expect_success 'change submodule url' '
|
|
(
|
|
cd super &&
|
|
cd submodule &&
|
|
git checkout master &&
|
|
git pull
|
|
) &&
|
|
mv submodule moved-submodule &&
|
|
(
|
|
cd moved-submodule &&
|
|
git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule &&
|
|
test_tick &&
|
|
git commit -a -m moved-sub-submodule
|
|
) &&
|
|
(
|
|
cd super &&
|
|
git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
|
|
test_tick &&
|
|
git commit -a -m moved-submodule
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should update submodule URLs' '
|
|
(
|
|
cd super-clone &&
|
|
git pull --no-recurse-submodules &&
|
|
git submodule sync
|
|
) &&
|
|
test -d "$(
|
|
cd super-clone/submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
test ! -d "$(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
(
|
|
cd super-clone/submodule &&
|
|
git checkout master &&
|
|
git pull
|
|
) &&
|
|
(
|
|
cd super-clone &&
|
|
test -d "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync --recursive" should update all submodule URLs' '
|
|
(
|
|
cd super-clone &&
|
|
(
|
|
cd submodule &&
|
|
git pull --no-recurse-submodules
|
|
) &&
|
|
git submodule sync --recursive
|
|
) &&
|
|
test -d "$(
|
|
cd super-clone/submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
test -d "$(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git checkout master &&
|
|
git pull
|
|
)
|
|
'
|
|
|
|
test_expect_success 'reset submodule URLs' '
|
|
reset_submodule_urls super-clone
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should update submodule URLs - subdirectory' '
|
|
(
|
|
cd super-clone &&
|
|
git pull --no-recurse-submodules &&
|
|
mkdir -p sub &&
|
|
cd sub &&
|
|
git submodule sync >../../output
|
|
) &&
|
|
test_i18ngrep "\\.\\./submodule" output &&
|
|
test -d "$(
|
|
cd super-clone/submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
test ! -d "$(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
(
|
|
cd super-clone/submodule &&
|
|
git checkout master &&
|
|
git pull
|
|
) &&
|
|
(
|
|
cd super-clone &&
|
|
test -d "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync --recursive" should update all submodule URLs - subdirectory' '
|
|
(
|
|
cd super-clone &&
|
|
(
|
|
cd submodule &&
|
|
git pull --no-recurse-submodules
|
|
) &&
|
|
mkdir -p sub &&
|
|
cd sub &&
|
|
git submodule sync --recursive >../../output
|
|
) &&
|
|
test_i18ngrep "\\.\\./submodule/sub-submodule" output &&
|
|
test -d "$(
|
|
cd super-clone/submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
test -d "$(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git checkout master &&
|
|
git pull
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should update known submodule URLs' '
|
|
(
|
|
cd empty-clone &&
|
|
git pull &&
|
|
git submodule sync &&
|
|
test -d "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should not vivify uninteresting submodule' '
|
|
(
|
|
cd top-only-clone &&
|
|
git pull &&
|
|
git submodule sync &&
|
|
test -z "$(git config submodule.submodule.url)" &&
|
|
git submodule sync submodule &&
|
|
test -z "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form foo' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin foo &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual fails with: "cannot strip off url foo
|
|
test "$(git config remote.origin.url)" = "../submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form foo/bar' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin foo/bar &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual foo/submodule
|
|
test "$(git config remote.origin.url)" = "../foo/submodule"
|
|
) &&
|
|
(
|
|
cd submodule/sub-submodule &&
|
|
test "$(git config remote.origin.url)" != "../../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync --recursive" propagates changes in origin' '
|
|
(
|
|
cd recursive-clone &&
|
|
git remote set-url origin foo/bar &&
|
|
git submodule sync --recursive &&
|
|
(
|
|
cd submodule &&
|
|
#actual foo/submodule
|
|
test "$(git config remote.origin.url)" = "../foo/submodule"
|
|
) &&
|
|
(
|
|
cd submodule/sub-submodule &&
|
|
test "$(git config remote.origin.url)" = "../../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ./foo' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin ./foo &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual ./submodule
|
|
test "$(git config remote.origin.url)" = "../submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ./foo/bar' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin ./foo/bar &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual ./foo/submodule
|
|
test "$(git config remote.origin.url)" = "../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin ../foo &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual ../submodule
|
|
test "$(git config remote.origin.url)" = "../../submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin ../foo/bar &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual ../foo/submodule
|
|
test "$(git config remote.origin.url)" = "../../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin ../foo/bar &&
|
|
mkdir -p a/b/c &&
|
|
(
|
|
cd a/b/c &&
|
|
git init &&
|
|
>.gitignore &&
|
|
git add .gitignore &&
|
|
test_tick &&
|
|
git commit -m "initial commit"
|
|
) &&
|
|
git submodule add ../bar/a/b/c ./a/b/c &&
|
|
git submodule sync &&
|
|
(
|
|
cd a/b/c &&
|
|
#actual ../foo/bar/a/b/c
|
|
test "$(git config remote.origin.url)" = "../../../../foo/bar/a/b/c"
|
|
)
|
|
)
|
|
'
|
|
|
|
|
|
test_done
|