From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:59:08 +0000 (-0700)
Subject: Merge branch 'js/fsck-name-object' into maint
X-Git-Tag: v2.13.3~7
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=8e7b78a6929b9d331382b6bda09a718f3aa966c0;p=git.git

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

Test fix.

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

8e7b78a6929b9d331382b6bda09a718f3aa966c0
diff --cc t/t1450-fsck.sh
index adf0bc88b,30e217dea..bb89e1a5d
--- 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
  	)
  '