Merge branch 'ab/detox-gettext-tests'

gitster · gitster · commit 7652ce966f9b · 2021-03-30T14:35:38.000-07:00
Testfix.

* ab/detox-gettext-tests:
  mktag tests: fix broken "&amp;&amp;" chain
diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
@@ -17,7 +17,7 @@ check_verify_failure () {
 		grep '$2' message &&
 		if test '$3' != '--no-strict'
 		then
-			test_must_fail git mktag --no-strict <tag.sig 2>message.no-strict &&xb
+			test_must_fail git mktag --no-strict <tag.sig 2>message.no-strict &&
 			grep '$2' message.no-strict
 		fi
 	"

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ check_verify_failure () {`
`17`	`17`	`grep '$2' message &&`
`18`	`18`	`if test '$3' != '--no-strict'`
`19`	`19`	`then`
`20`		`- test_must_fail git mktag --no-strict <tag.sig 2>message.no-strict &&xb`
	`20`	`+ test_must_fail git mktag --no-strict <tag.sig 2>message.no-strict &&`
`21`	`21`	`grep '$2' message.no-strict`
`22`	`22`	`fi`
`23`	`23`	`"`