summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-18 11:59:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-18 11:59:35 -0700
commitdd42145b1e953fe579778c13a3ad34aa59aa95fe (patch)
treef2b49717dd2e34e25368a05b135e75d5e77be51f /t
parentMerge branch 'tr/log-full-diff-keep-true-parents' into maint (diff)
parentavoid segfault on submodule.*.path set to an empty "true" (diff)
downloadtgif-dd42145b1e953fe579778c13a3ad34aa59aa95fe.tar.xz
Merge branch 'jl/some-submodule-config-are-not-boolean' into maint
* jl/some-submodule-config-are-not-boolean: avoid segfault on submodule.*.path set to an empty "true"
Diffstat (limited to 't')
-rwxr-xr-xt/t7400-submodule-basic.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 5ee97b003a..a39d074465 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -18,6 +18,16 @@ test_expect_success 'setup - initial commit' '
git branch initial
'
+test_expect_success 'configuration parsing' '
+ test_when_finished "rm -f .gitmodules" &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "s"]
+ path
+ ignore
+ EOF
+ test_must_fail git status
+'
+
test_expect_success 'setup - repository in init subdirectory' '
mkdir init &&
(