aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-10 21:31:08 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-10 21:31:08 -0800
commit8c5514906a532f154aa0db1199f46bbdeeffb0ad (patch)
tree1485160c77cf35751367c5966023ddcecd116154 /t
parent6e5d7ddc490fc7fdf46a5d0af35aa6fd64ae4a96 (diff)
parent496917b721adae11e596cd44b13cb8a49c388de7 (diff)
downloadgit-8c5514906a532f154aa0db1199f46bbdeeffb0ad.tar.gz
git-8c5514906a532f154aa0db1199f46bbdeeffb0ad.tar.xz
Merge branch 'js/git-submodule-trailing-slash'
* js/git-submodule-trailing-slash: submodule: warn about non-submodules Let ls-files strip trailing slashes in submodules' paths
Diffstat (limited to 't')
-rwxr-xr-xt/t7400-submodule-basic.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 2ec7ac6a5..b8cb2df66 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -234,4 +234,17 @@ test_expect_success 'gracefully add submodule with a trailing slash' '
'
+test_expect_success 'ls-files gracefully handles trailing slash' '
+
+ test "init" = "$(git ls-files init/)"
+
+'
+
+test_expect_success 'submodule <invalid-path> warns' '
+
+ git submodule no-such-submodule 2> output.err &&
+ grep "^error: .*no-such-submodule" output.err
+
+'
+
test_done