From f3670a5749d704fe1edee4201f9b23adbf0bf967 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 7 Feb 2009 14:43:03 +0100 Subject: Let ls-files strip trailing slashes in submodules' paths Tab completion makes it easy to add a trailing slash to a submodule path. As it is completely clear what the user actually wanted to say, be nice and strip that slash at the end. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- t/t7400-submodule-basic.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 't/t7400-submodule-basic.sh') diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 2ec7ac6a51..a74f24c0db 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -234,4 +234,10 @@ 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_done -- cgit v1.3 From 496917b721adae11e596cd44b13cb8a49c388de7 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 7 Feb 2009 14:43:15 +0100 Subject: submodule: warn about non-submodules Earlier, when you called git submodule some/bogus/path Git would silently ignore the path, without warning the user about the likely mistake. Now it does. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- git-submodule.sh | 2 +- t/t7400-submodule-basic.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 't/t7400-submodule-basic.sh') diff --git a/git-submodule.sh b/git-submodule.sh index 2f47e065fe..6cc2d334c0 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -59,7 +59,7 @@ resolve_relative_url () # module_list() { - git ls-files --stage -- "$@" | grep '^160000 ' + git ls-files --error-unmatch --stage -- "$@" | grep '^160000 ' } # diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index a74f24c0db..b8cb2df667 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -240,4 +240,11 @@ test_expect_success 'ls-files gracefully handles trailing slash' ' ' +test_expect_success 'submodule warns' ' + + git submodule no-such-submodule 2> output.err && + grep "^error: .*no-such-submodule" output.err + +' + test_done -- cgit v1.3