aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-02 13:42:32 -0700
committerJunio C Hamano <gitster@pobox.com>2012-10-02 13:42:32 -0700
commite2c7a5b646bb9a4f126577346697d79b3143d30b (patch)
tree9cde48edade6f47bebff07e41e4f02c045c35879 /t
parent0a65df58a0d5b17a72edd4e6247be29ab8af2b09 (diff)
parentaf9c9f97137dfb3f20a17d76520803c0312fd3e4 (diff)
downloadgit-e2c7a5b646bb9a4f126577346697d79b3143d30b.tar.gz
git-e2c7a5b646bb9a4f126577346697d79b3143d30b.tar.xz
Merge branch 'rr/maint-submodule-unknown-cmd' into maint
"git submodule frotz" was not diagnosed as "frotz" being an unknown subcommand to "git submodule"; the user instead got a complaint that "git submodule status" was run with an unknown path "frotz". * rr/maint-submodule-unknown-cmd: submodule: if $command was not matched, don't parse other args
Diffstat (limited to 't')
-rwxr-xr-xt/t7400-submodule-basic.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 56a81cd74..539703749 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -438,8 +438,8 @@ test_expect_success 'moving to a commit without submodule does not leave empty d
git checkout second
'
-test_expect_success 'submodule <invalid-path> warns' '
- test_failure_with_unknown_submodule
+test_expect_success 'submodule <invalid-subcommand> fails' '
+ test_must_fail git submodule no-such-subcommand
'
test_expect_success 'add submodules without specifying an explicit path' '