diff options
| author | Brandon Casey <casey@nrlssc.navy.mil> | 2008-03-20 11:54:30 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-22 17:23:29 -0700 |
| commit | c8a086929060eef9f0ce9f149d9dc22a6df6b85a (patch) | |
| tree | 48d50412accb60c43a028b57fd1a53c204a26ef0 /t/t7003-filter-branch.sh | |
| parent | 8114da161611d6eb7cc6163aee2f5ba51ccad9f3 (diff) | |
| download | git-c8a086929060eef9f0ce9f149d9dc22a6df6b85a.tar.gz git-c8a086929060eef9f0ce9f149d9dc22a6df6b85a.tar.xz | |
t/t7003-filter-branch.sh: use test_must_fail rather than '!'
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7003-filter-branch.sh')
| -rwxr-xr-x | t/t7003-filter-branch.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 553131fcf..6827249da 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -78,7 +78,7 @@ test_expect_success 'filter subdirectory only' ' test_expect_success 'subdirectory filter result looks okay' ' test 2 = $(git rev-list sub | wc -l) && git show sub:new && - ! git show sub:subdir + test_must_fail git show sub:subdir ' test_expect_success 'setup and filter history that requires --full-history' ' @@ -100,7 +100,7 @@ test_expect_success 'subdirectory filter result looks okay' ' test 3 = $(git rev-list -1 --parents sub-master | wc -w) && git show sub-master^:new && git show sub-master^2:new && - ! git show sub:subdir + test_must_fail git show sub:subdir ' test_expect_success 'use index-filter to move into a subdirectory' ' @@ -114,7 +114,7 @@ test_expect_success 'use index-filter to move into a subdirectory' ' test_expect_success 'stops when msg filter fails' ' old=$(git rev-parse HEAD) && - ! git-filter-branch -f --msg-filter false HEAD && + test_must_fail git-filter-branch -f --msg-filter false HEAD && test $old = $(git rev-parse HEAD) && rm -rf .git-rewrite ' @@ -151,8 +151,8 @@ test_expect_success "remove a certain author's commits" ' ' test_expect_success 'barf on invalid name' ' - ! git filter-branch -f master xy-problem && - ! git filter-branch -f HEAD^ + test_must_fail git filter-branch -f master xy-problem && + test_must_fail git filter-branch -f HEAD^ ' test_expect_success '"map" works in commit filter' ' @@ -174,7 +174,7 @@ test_expect_success 'Name needing quotes' ' git add foo && git commit -m "Adding a file" && git filter-branch --tree-filter "rm -fr foo" && - ! git ls-files --error-unmatch "foo/$name" && + test_must_fail git ls-files --error-unmatch "foo/$name" && test $(git rev-parse --verify rerere) != $(git rev-parse --verify A) ' |