Merge branch 'mk/grep-pcre'

gitster · gitster · commit 13b70d2ad96a · 2011-06-20T14:49:44.000-07:00
* mk/grep-pcre:
  t7810: avoid unportable use of "echo"
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
@@ -658,9 +658,9 @@ test_expect_success LIBPCRE 'grep -P -v pattern' '
 '
 
 test_expect_success LIBPCRE 'grep -P -i pattern' '
-	{
-		echo "hello.c:	printf(\"Hello world.\n\");"
-	} >expected &&
+	cat >expected <<-EOF &&
+	hello.c:	printf("Hello world.\n");
+	EOF
 	git grep -P -i "PRINTF\([^\d]+\)" hello.c >actual &&
 	test_cmp expected actual
 '

Original file line number	Diff line number	Diff line change
`@@ -658,9 +658,9 @@ test_expect_success LIBPCRE 'grep -P -v pattern' '`
`658`	`658`	`'`
`659`	`659`
`660`	`660`	`test_expect_success LIBPCRE 'grep -P -i pattern' '`
`661`		`- {`
`662`		`- echo "hello.c: printf(\"Hello world.\n\");"`
`663`		`- } >expected &&`
	`661`	`+ cat >expected <<-EOF &&`
	`662`	`+ hello.c: printf("Hello world.\n");`
	`663`	`+ EOF`
`664`	`664`	`git grep -P -i "PRINTF\([^\d]+\)" hello.c >actual &&`
`665`	`665`	`test_cmp expected actual`
`666`	`666`	`'`