diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-20 16:02:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-20 16:02:24 -0700 |
| commit | 01c0615dceb433a5498c7160d67f77a6cc9197bb (patch) | |
| tree | 422612ad3a7e7b0aea14905a815c5d60d5914351 /t/t7400-submodule-basic.sh | |
| parent | Merge branch 'fc/makefile' (diff) | |
| parent | test: test_must_be_empty helper (diff) | |
| download | tgif-01c0615dceb433a5498c7160d67f77a6cc9197bb.tar.xz | |
Merge branch 'fc/show-non-empty-errors-in-test'
* fc/show-non-empty-errors-in-test:
test: test_must_be_empty helper
Diffstat (limited to 't/t7400-submodule-basic.sh')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index ff265353a3..f47cc7b604 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -78,7 +78,7 @@ test_expect_success 'submodule add' ' ( cd addtest && git submodule add -q "$submodurl" submod >actual && - test ! -s actual && + test_must_be_empty actual && echo "gitdir: ../.git/modules/submod" >expect && test_cmp expect submod/.git && ( @@ -308,7 +308,7 @@ test_expect_success 'update should work when path is an empty dir' ' mkdir init && git submodule update -q >update.out && - test ! -s update.out && + test_must_be_empty update.out && inspect init && test_cmp expect head-sha1 @@ -696,7 +696,7 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano rm -rf repo && git rm repo && git submodule add -q --name repo_new "$submodurl/bare.git" repo >actual && - test ! -s actual && + test_must_be_empty actual && echo "gitdir: ../.git/modules/submod" >expect && test_cmp expect submod/.git && ( |