Merge branch 'tz/c-locale-output-is-no-more'

gitster · gitster · commit 2b8b1aa6ad9d · 2021-05-21T05:50:32.000+09:00
Test update.

* tz/c-locale-output-is-no-more:
  t7500: remove non-existant C_LOCALE_OUTPUT prereq
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
@@ -413,7 +413,7 @@ test_expect_success 'amend! commit allows empty commit msg body with --allow-emp
 '
 
 test_fixup_reword_opt () {
-	test_expect_success C_LOCALE_OUTPUT "--fixup=reword: incompatible with $1" "
+	test_expect_success "--fixup=reword: incompatible with $1" "
 		echo 'fatal: reword option of --fixup is mutually exclusive with'\
 			'--patch/--interactive/--all/--include/--only' >expect &&
 		test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual &&

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ test_expect_success 'amend! commit allows empty commit msg body with --allow-emp`
`413`	`413`	`'`
`414`	`414`
`415`	`415`	`test_fixup_reword_opt () {`
`416`		`- test_expect_success C_LOCALE_OUTPUT "--fixup=reword: incompatible with $1" "`
	`416`	`+ test_expect_success "--fixup=reword: incompatible with $1" "`
`417`	`417`	`echo 'fatal: reword option of --fixup is mutually exclusive with'\`
`418`	`418`	`'--patch/--interactive/--all/--include/--only' >expect &&`
`419`	`419`	`test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual &&`