mirror of
https://github.com/git/git
synced 2024-08-26 19:19:18 +00:00
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
This commit is contained in:
commit
2b8b1aa6ad
|
@ -413,7 +413,7 @@ test_expect_success 'amend! commit allows empty commit msg body with --allow-emp
|
||||||
'
|
'
|
||||||
|
|
||||||
test_fixup_reword_opt () {
|
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'\
|
echo 'fatal: reword option of --fixup is mutually exclusive with'\
|
||||||
'--patch/--interactive/--all/--include/--only' >expect &&
|
'--patch/--interactive/--all/--include/--only' >expect &&
|
||||||
test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual &&
|
test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual &&
|
||||||
|
|
Loading…
Reference in a new issue