Merge branch 'js/fsck-name-object' into maint

Test fix.

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

diff --cc t/t1450-fsck.sh
index adf0bc88ba510f08d9429ae0f2fb2b2d37424ff4,30e217dea22375dbe9a113e18fbb14fa6c89cecd..bb89e1a5db293dd886bff9df668bcaf187a58d11
--- 1/t/t1450-fsck.sh
--- 2/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@@ -570,10 -538,10 +570,10 @@@ test_expect_success 'fsck --name-object
                test_commit julius caesar.t &&
                test_commit augustus &&
                test_commit caesar &&
 -              remove_loose_object $(git rev-parse julius:caesar.t) &&
 +              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
        )
  '