Sync with Git 2.14.4
* maint-2.14: Git 2.14.5 submodule-config: ban submodule paths that start with a dash submodule-config: ban submodule urls that start with dash submodule--helper: use "--" to signal end of clone options
This commit is contained in:
34
t/t7416-submodule-dash-url.sh
Executable file
34
t/t7416-submodule-dash-url.sh
Executable file
@ -0,0 +1,34 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description='check handling of .gitmodule url with dash'
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'create submodule with protected dash in url' '
|
||||
git init upstream &&
|
||||
git -C upstream commit --allow-empty -m base &&
|
||||
mv upstream ./-upstream &&
|
||||
git submodule add ./-upstream sub &&
|
||||
git add sub .gitmodules &&
|
||||
git commit -m submodule
|
||||
'
|
||||
|
||||
test_expect_success 'clone can recurse submodule' '
|
||||
test_when_finished "rm -rf dst" &&
|
||||
git clone --recurse-submodules . dst &&
|
||||
echo base >expect &&
|
||||
git -C dst/sub log -1 --format=%s >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'remove ./ protection from .gitmodules url' '
|
||||
perl -i -pe "s{\./}{}" .gitmodules &&
|
||||
git commit -am "drop protection"
|
||||
'
|
||||
|
||||
test_expect_success 'clone rejects unprotected dash' '
|
||||
test_when_finished "rm -rf dst" &&
|
||||
test_must_fail git clone --recurse-submodules . dst 2>err &&
|
||||
test_i18ngrep ignoring err
|
||||
'
|
||||
|
||||
test_done
|
20
t/t7417-submodule-path-url.sh
Executable file
20
t/t7417-submodule-path-url.sh
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description='check handling of .gitmodule path with dash'
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'create submodule with dash in path' '
|
||||
git init upstream &&
|
||||
git -C upstream commit --allow-empty -m base &&
|
||||
git submodule add ./upstream sub &&
|
||||
git mv sub ./-sub &&
|
||||
git commit -m submodule
|
||||
'
|
||||
|
||||
test_expect_success 'clone rejects unprotected dash' '
|
||||
test_when_finished "rm -rf dst" &&
|
||||
git clone --recurse-submodules . dst 2>err &&
|
||||
test_i18ngrep ignoring err
|
||||
'
|
||||
|
||||
test_done
|
Reference in New Issue
Block a user