diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:40 -0700 |
| commit | ea7aa4f612ef33ecfb7fd6d488d949da3a51a377 (patch) | |
| tree | 0342252fde5f2b5721299d321d57ce12542b2957 | |
| parent | Merge branch 'ds/multi-pack-verify' (diff) | |
| parent | t5703: replace "grep -a" usage by perl (diff) | |
| download | tgif-ea7aa4f612ef33ecfb7fd6d488d949da3a51a377.tar.xz | |
Merge branch 'dd/t5703-grep-a-fix'
Update an unconditional use of "grep -a" with a perl script in a test.
* dd/t5703-grep-a-fix:
t5703: replace "grep -a" usage by perl
| -rwxr-xr-x | t/t5703-upload-pack-ref-in-want.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh index a34460f7d8..92ad5eeec0 100755 --- a/t/t5703-upload-pack-ref-in-want.sh +++ b/t/t5703-upload-pack-ref-in-want.sh @@ -49,15 +49,18 @@ test_expect_success 'setup repository' ' test_expect_success 'config controls ref-in-want advertisement' ' test-tool serve-v2 --advertise-capabilities >out && - ! grep -a ref-in-want out && + perl -ne "/ref-in-want/ and print" out >out.filter && + test_must_be_empty out.filter && git config uploadpack.allowRefInWant false && test-tool serve-v2 --advertise-capabilities >out && - ! grep -a ref-in-want out && + perl -ne "/ref-in-want/ and print" out >out.filter && + test_must_be_empty out.filter && git config uploadpack.allowRefInWant true && test-tool serve-v2 --advertise-capabilities >out && - grep -a ref-in-want out + perl -ne "/ref-in-want/ and print" out >out.filter && + test_file_not_empty out.filter ' test_expect_success 'invalid want-ref line' ' |