From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Jul 2017 01:14:43 +0000 (-0700)
Subject: Merge branch 'js/fsck-name-object'
X-Git-Tag: v2.14.0-rc0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f58a34cad97c562f88c9d502c4f3b8886355cbe

Merge branch 'js/fsck-name-object'

Test fix.

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

8f58a34cad97c562f88c9d502c4f3b8886355cbe
diff --cc t/t1450-fsck.sh
index adf0bc88ba,30e217dea2..bb89e1a5db
--- a/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
  	)
  '