Merge branch 'js/fsck-name-object' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:59:08 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:59:08 +0000 (13:59 -0700)
commit8e7b78a6929b9d331382b6bda09a718f3aa966c0
tree78a2c96d9c210649f56525313cf61c7448d33fac
parent5a24b4e14a7120879213aad9a13b1914e5756820
parent73fc2aadc748da8a5515345ab02657e4db7f66d4
Merge branch 'js/fsck-name-object' into maint

Test fix.

* js/fsck-name-object:
  t1450: use egrep for regexp "alternation"
t/t1450-fsck.sh