diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-07-06 18:14:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-06 18:14:43 -0700 |
| commit | 8f58a34cad97c562f88c9d502c4f3b8886355cbe (patch) | |
| tree | 772c55208aad03bcb5fce827bfdbf11b60950040 | |
| parent | Merge branch 'aw/contrib-subtree-doc-asciidoctor' (diff) | |
| parent | t1450: use egrep for regexp "alternation" (diff) | |
| download | tgif-8f58a34cad97c562f88c9d502c4f3b8886355cbe.tar.xz | |
Merge branch 'js/fsck-name-object'
Test fix.
* js/fsck-name-object:
t1450: use egrep for regexp "alternation"
| -rwxr-xr-x | t/t1450-fsck.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index adf0bc88ba..bb89e1a5db 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -573,7 +573,7 @@ test_expect_success 'fsck --name-objects' ' remove_object $(git rev-parse julius:caesar.t) && test_must_fail git fsck --name-objects >out && tree=$(git rev-parse --verify julius:) && - grep "$tree (\(refs/heads/master\|HEAD\)@{[0-9]*}:" out + egrep "$tree \((refs/heads/master|HEAD)@\{[0-9]*\}:" out ) ' |