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

gitster · gitster · commit 8e7b78a6929b · 2017-07-10T13:59:08.000-07:00
Test fix.

* js/fsck-name-object:
  t1450: use egrep for regexp "alternation"
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
@@ -573,7 +573,7 @@ test_expect_success 'fsck --name-objects' '
 		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
 	)
 '
 

Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ test_expect_success 'fsck --name-objects' '`
`573`	`573`	`remove_object $(git rev-parse julius:caesar.t) &&`
`574`	`574`	`test_must_fail git fsck --name-objects >out &&`
`575`	`575`	`tree=$(git rev-parse --verify julius:) &&`
`576`		`- grep "$tree (\(refs/heads/master\\|HEAD\)@{[0-9]*}:" out`
	`576`	`+ egrep "$tree \((refs/heads/master\|HEAD)@\{[0-9]*\}:" out`
`577`	`577`	`)`
`578`	`578`	`'`
`579`	`579`