diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-08 03:04:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-08 03:04:02 +0100 |
| commit | a8e2394704d0543f4e1f1ac6ea532d098316d97e (patch) | |
| tree | 9120b53b6c93bb8db02997cb446a4311a7e21311 /t/t6102-rev-list-unexpected-objects.sh | |
| parent | Merge branch 'la/strvec-header-fix' (diff) | |
| parent | tests: teach callers of test_i18ngrep to use test_grep (diff) | |
| download | git-a8e2394704d0543f4e1f1ac6ea532d098316d97e.tar.xz git-a8e2394704d0543f4e1f1ac6ea532d098316d97e.zip | |
Merge branch 'jc/test-i18ngrep'
Another step to deprecate test_i18ngrep.
* jc/test-i18ngrep:
tests: teach callers of test_i18ngrep to use test_grep
test framework: further deprecate test_i18ngrep
Diffstat (limited to 't/t6102-rev-list-unexpected-objects.sh')
| -rwxr-xr-x | t/t6102-rev-list-unexpected-objects.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh index 9350b5fd2c..5d28507efc 100755 --- a/t/t6102-rev-list-unexpected-objects.sh +++ b/t/t6102-rev-list-unexpected-objects.sh @@ -28,7 +28,7 @@ test_expect_success 'TODO (should fail!): traverse unexpected non-blob entry (lo test_expect_success 'traverse unexpected non-blob entry (seen)' ' test_must_fail git rev-list --objects $tree $broken_tree >output 2>&1 && - test_i18ngrep "is not a blob" output + test_grep "is not a blob" output ' test_expect_success 'setup unexpected non-tree entry' ' @@ -42,7 +42,7 @@ test_expect_success 'traverse unexpected non-tree entry (lone)' ' test_expect_success 'traverse unexpected non-tree entry (seen)' ' test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 && - test_i18ngrep "is not a tree" output + test_grep "is not a tree" output ' test_expect_success 'setup unexpected non-commit parent' ' @@ -54,13 +54,13 @@ test_expect_success 'setup unexpected non-commit parent' ' test_expect_success 'traverse unexpected non-commit parent (lone)' ' test_must_fail git rev-list --objects $broken_commit >output 2>&1 && - test_i18ngrep "not a commit" output + test_grep "not a commit" output ' test_expect_success 'traverse unexpected non-commit parent (seen)' ' test_must_fail git rev-list --objects $blob $broken_commit \ >output 2>&1 && - test_i18ngrep "not a commit" output + test_grep "not a commit" output ' test_expect_success 'setup unexpected non-tree root' ' @@ -76,7 +76,7 @@ test_expect_success 'traverse unexpected non-tree root (lone)' ' test_expect_success 'traverse unexpected non-tree root (seen)' ' test_must_fail git rev-list --objects $blob $broken_commit \ >output 2>&1 && - test_i18ngrep "not a tree" output + test_grep "not a tree" output ' test_expect_success 'setup unexpected non-commit tag' ' @@ -93,7 +93,7 @@ test_expect_success 'traverse unexpected non-commit tag (lone)' ' test_expect_success 'traverse unexpected non-commit tag (seen)' ' test_must_fail git rev-list --objects $blob $tag >output 2>&1 && - test_i18ngrep "not a commit" output + test_grep "not a commit" output ' test_expect_success 'setup unexpected non-tree tag' ' @@ -110,7 +110,7 @@ test_expect_success 'traverse unexpected non-tree tag (lone)' ' test_expect_success 'traverse unexpected non-tree tag (seen)' ' test_must_fail git rev-list --objects $blob $tag >output 2>&1 && - test_i18ngrep "not a tree" output + test_grep "not a tree" output ' test_expect_success 'setup unexpected non-blob tag' ' @@ -127,7 +127,7 @@ test_expect_success 'traverse unexpected non-blob tag (lone)' ' test_expect_success 'traverse unexpected non-blob tag (seen)' ' test_must_fail git rev-list --objects $commit $tag >output 2>&1 && - test_i18ngrep "not a blob" output + test_grep "not a blob" output ' test_done |