Merge branch 'js/t5404-path-fix'

gitster · gitster · commit 3d5a179ec01f · 2018-04-25T13:29:00.000+09:00
Test fix.

* js/t5404-path-fix:
  t5404: relax overzealous test
diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh
@@ -56,7 +56,7 @@ test_expect_success 'deleted branches have their tracking branches removed' '
 test_expect_success 'already deleted tracking branches ignored' '
 	git branch -d -r origin/b3 &&
 	git push origin :b3 >output 2>&1 &&
-	! grep error output
+	! grep "^error: " output
 '
 
 test_done

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ test_expect_success 'deleted branches have their tracking branches removed' '`
`56`	`56`	`test_expect_success 'already deleted tracking branches ignored' '`
`57`	`57`	`git branch -d -r origin/b3 &&`
`58`	`58`	`git push origin :b3 >output 2>&1 &&`
`59`		`- ! grep error output`
	`59`	`+ ! grep "^error: " output`
`60`	`60`	`'`
`61`	`61`
`62`	`62`	`test_done`