diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:56 -0800 |
| commit | c17de5a505a2da23fcbfefdc8b0aad3f045a510f (patch) | |
| tree | ffe4bd8ace908793b99ee45fb8e1b17be5fb7e2d /t/t5606-clone-options.sh | |
| parent | 2c5410480ea7ea92e39667fedc8eba1f7a95bc9e (diff) | |
| parent | 246cac85055f513626159e8cd20b741eaf5f9f97 (diff) | |
| download | git-c17de5a505a2da23fcbfefdc8b0aad3f045a510f.tar.gz | |
Merge branch 'ja/i18n-similar-messages'
Similar message templates have been consolidated so that
translators need to work on fewer number of messages.
* ja/i18n-similar-messages:
i18n: turn even more messages into "cannot be used together" ones
i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"
i18n: factorize "--foo outside a repository"
i18n: refactor "unrecognized %(foo) argument" strings
i18n: factorize "no directory given for --foo"
i18n: factorize "--foo requires --bar" and the like
i18n: tag.c factorize i18n strings
i18n: standardize "cannot open" and "cannot read"
i18n: turn "options are incompatible" into "cannot be used together"
i18n: refactor "%s, %s and %s are mutually exclusive"
i18n: refactor "foo and bar are mutually exclusive"
Diffstat (limited to 't/t5606-clone-options.sh')
| -rwxr-xr-x | t/t5606-clone-options.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh index d822153e4d..8f676d6b0c 100755 --- a/t/t5606-clone-options.sh +++ b/t/t5606-clone-options.sh @@ -46,7 +46,7 @@ test_expect_success 'disallows --bare with --origin' ' test_must_fail git clone -o foo --bare parent clone-bare-o 2>err && test_debug "cat err" && - test_i18ngrep -e "--bare and --origin foo options are incompatible" err + test_i18ngrep -e "options .--bare. and .--origin foo. cannot be used together" err ' @@ -54,7 +54,7 @@ test_expect_success 'disallows --bare with --separate-git-dir' ' test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err && test_debug "cat err" && - test_i18ngrep -e "--bare and --separate-git-dir are incompatible" err + test_i18ngrep -e "options .--bare. and .--separate-git-dir. cannot be used together" err ' |