Merge branch 'lt/request-pull' into maint

gitster · gitster · commit 85dd37941a10 · 2014-07-22T10:23:41.000-07:00
* lt/request-pull:
  fix brown paper bag breakage in t5150-request-pull.sh
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
@@ -229,7 +229,7 @@ test_expect_success 'pull request format' '
 		cd local &&
 		git request-pull initial "$downstream_url" full
 	) >request &&
-	grep ' tags/full$'
+	grep " tags/full\$" request
 '
 
 test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ test_expect_success 'pull request format' '`
`229`	`229`	`cd local &&`
`230`	`230`	`git request-pull initial "$downstream_url" full`
`231`	`231`	`) >request &&`
`232`		`- grep ' tags/full$'`
	`232`	`+ grep " tags/full\$" request`
`233`	`233`	`'`
`234`	`234`
`235`	`235`	`test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '`