diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:08 -0700 |
| commit | 8e7b78a6929b9d331382b6bda09a718f3aa966c0 (patch) | |
| tree | 78a2c96d9c210649f56525313cf61c7448d33fac | |
| parent | 5a24b4e14a7120879213aad9a13b1914e5756820 (diff) | |
| parent | 73fc2aadc748da8a5515345ab02657e4db7f66d4 (diff) | |
| download | git-8e7b78a6929b9d331382b6bda09a718f3aa966c0.tar.gz | |
Merge branch 'js/fsck-name-object' into maint
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 ) ' |