summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-13 13:18:28 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-13 13:18:28 -0700
commit4f5067010d16937e040039d9aec4b16920f7d210 (patch)
tree5d84cb5a8f19d7fb8dd6e15b25afb11e86e3c09e
parent50b26f561298c58029d408f4b0c5bca20b7806a3 (diff)
parent14544dd215360343d9cc70c3675b9479c871a1ae (diff)
downloadgit-4f5067010d16937e040039d9aec4b16920f7d210.tar.gz
Merge branch 'sb/submodule-module-list-pathspec-fix'
* sb/submodule-module-list-pathspec-fix: submodule deinit test: fix broken && chain in subshell
-rwxr-xr-xt/t7400-submodule-basic.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index f99f674ac7..d48d63a6fd 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -898,7 +898,7 @@ test_expect_success 'submodule deinit works on repository without submodules' '
git init &&
>file &&
git add file &&
- git commit -m "repo should not be empty"
+ git commit -m "repo should not be empty" &&
git submodule deinit .
)
'