mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-19 19:39:56 -05:00
Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11
* hv/submodule-path-unmatch: Let submodule command exit with error status if path does not exist
This commit is contained in:
@@ -258,6 +258,27 @@ test_expect_success 'init should register submodule url in .git/config' '
|
||||
test_cmp expect url
|
||||
'
|
||||
|
||||
test_failure_with_unknown_submodule () {
|
||||
test_must_fail git submodule $1 no-such-submodule 2>output.err &&
|
||||
grep "^error: .*no-such-submodule" output.err
|
||||
}
|
||||
|
||||
test_expect_success 'init should fail with unknown submodule' '
|
||||
test_failure_with_unknown_submodule init
|
||||
'
|
||||
|
||||
test_expect_success 'update should fail with unknown submodule' '
|
||||
test_failure_with_unknown_submodule update
|
||||
'
|
||||
|
||||
test_expect_success 'status should fail with unknown submodule' '
|
||||
test_failure_with_unknown_submodule status
|
||||
'
|
||||
|
||||
test_expect_success 'sync should fail with unknown submodule' '
|
||||
test_failure_with_unknown_submodule sync
|
||||
'
|
||||
|
||||
test_expect_success 'update should fail when path is used by a file' '
|
||||
echo hello >expect &&
|
||||
|
||||
@@ -418,10 +439,7 @@ test_expect_success 'moving to a commit without submodule does not leave empty d
|
||||
'
|
||||
|
||||
test_expect_success 'submodule <invalid-path> warns' '
|
||||
|
||||
git submodule no-such-submodule 2> output.err &&
|
||||
grep "^error: .*no-such-submodule" output.err
|
||||
|
||||
test_failure_with_unknown_submodule
|
||||
'
|
||||
|
||||
test_expect_success 'add submodules without specifying an explicit path' '
|
||||
|
||||
Reference in New Issue
Block a user