diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-21 05:50:32 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-21 05:50:32 +0900 |
| commit | 2b8b1aa6ad9d8d9ba15dbd1c1823b9db71994105 (patch) | |
| tree | 37238a85410099d331b67a50f9e1f0d43c11ab2c | |
| parent | c69f2f8c869361e9e2bdb9fb3ceb2fe058013744 (diff) | |
| parent | 58cf6056c9289e145c8f3de79ad0385e0976dbc0 (diff) | |
| download | git-2b8b1aa6ad9d8d9ba15dbd1c1823b9db71994105.tar.xz | |
Merge branch 'tz/c-locale-output-is-no-more'
Test update.
* tz/c-locale-output-is-no-more:
t7500: remove non-existant C_LOCALE_OUTPUT prereq
| -rwxr-xr-x | t/t7500-commit-template-squash-signoff.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh index 9092db5fdc..7d02f79c0d 100755 --- 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 && |