diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-10-24 13:34:02 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-10-24 13:34:02 +0900 |
commit | 1b4f85285f438d561d63b7e510e9e244eabc2d80 (patch) | |
tree | 0e01a011dbd266e9806689661e1cb7a5e24867db /t | |
parent | Eleventh batch (diff) | |
parent | t7419: change test_must_fail to ! for grep (diff) | |
download | tgif-1b4f85285f438d561d63b7e510e9e244eabc2d80.tar.xz |
Merge branch 'dl/submodule-set-branch'
Test update.
* dl/submodule-set-branch:
t7419: change test_must_fail to ! for grep
Diffstat (limited to 't')
-rwxr-xr-x | t/t7419-submodule-set-branch.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7419-submodule-set-branch.sh b/t/t7419-submodule-set-branch.sh index c4b370ea85..fd25f786a3 100755 --- a/t/t7419-submodule-set-branch.sh +++ b/t/t7419-submodule-set-branch.sh @@ -34,7 +34,7 @@ test_expect_success 'submodule config cache setup' ' test_expect_success 'ensure submodule branch is unset' ' (cd super && - test_must_fail grep branch .gitmodules + ! grep branch .gitmodules ) ' @@ -54,7 +54,7 @@ test_expect_success 'test submodule set-branch --branch' ' test_expect_success 'test submodule set-branch --default' ' (cd super && git submodule set-branch --default submodule && - test_must_fail grep branch .gitmodules && + ! grep branch .gitmodules && git submodule update --remote && cat <<-\EOF >expect && a @@ -80,7 +80,7 @@ test_expect_success 'test submodule set-branch -b' ' test_expect_success 'test submodule set-branch -d' ' (cd super && git submodule set-branch -d submodule && - test_must_fail grep branch .gitmodules && + ! grep branch .gitmodules && git submodule update --remote && cat <<-\EOF >expect && a |