Merge branch 'js/fsck-name-object' into maint
Test fix. * js/fsck-name-object: t1450: use egrep for regexp "alternation"
This commit is contained in:
commit
8e7b78a692
@ -573,7 +573,7 @@ test_expect_success 'fsck --name-objects' '
|
|||||||
remove_object $(git rev-parse julius:caesar.t) &&
|
remove_object $(git rev-parse julius:caesar.t) &&
|
||||||
test_must_fail git fsck --name-objects >out &&
|
test_must_fail git fsck --name-objects >out &&
|
||||||
tree=$(git rev-parse --verify julius:) &&
|
tree=$(git rev-parse --verify julius:) &&
|
||||||
grep "$tree (\(refs/heads/master\|HEAD\)@{[0-9]*}:" out
|
egrep "$tree \((refs/heads/master|HEAD)@\{[0-9]*\}:" out
|
||||||
)
|
)
|
||||||
'
|
'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user