summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-19 16:26:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-19 16:26:59 (GMT)
commitbd73c3f13f34ae47b956777aa4bb785b91078ee5 (patch)
treee8bb60fad5cf9b89cb79ab00233cf29b95180eda
parent6b55779afc4e211ff051c5129481a5f2a08ef306 (diff)
parent83f5fa58e8c1322f4f54ed6974da0348b54b5134 (diff)
downloadgit-bd73c3f13f34ae47b956777aa4bb785b91078ee5.zip
git-bd73c3f13f34ae47b956777aa4bb785b91078ee5.tar.gz
git-bd73c3f13f34ae47b956777aa4bb785b91078ee5.tar.bz2
Merge branch 'cf/submodule-progress-dissociate'
* cf/submodule-progress-dissociate: t7400: encapsulate setup code in test_expect_success
-rwxr-xr-xt/t7400-submodule-basic.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 2f53252..812db13 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -126,8 +126,10 @@ test_expect_success 'submodule add' '
test_cmp empty untracked
'
-test_create_repo parent &&
-test_commit -C parent one
+test_expect_success 'setup parent and one repository' '
+ test_create_repo parent &&
+ test_commit -C parent one
+'
test_expect_success 'redirected submodule add does not show progress' '
git -C addtest submodule add "file://$submodurl/parent" submod-redirected \