зеркало из https://github.com/microsoft/git.git
i18n: git-push "prevent you from losing" message
Gettextize the "To prevent you from losing history" message. A test in lib-httpd.sh and another in t5541-http-push.sh explicitly checked for this message. Change them to skip under GETTEXT_POISON=YesPlease. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
8352d29e00
Коммит
b32227e770
|
@ -129,9 +129,9 @@ static int push_with_options(struct transport *transport, int flags)
|
|||
return 0;
|
||||
|
||||
if (nonfastforward && advice_push_nonfastforward) {
|
||||
fprintf(stderr, "To prevent you from losing history, non-fast-forward updates were rejected\n"
|
||||
fprintf(stderr, _("To prevent you from losing history, non-fast-forward updates were rejected\n"
|
||||
"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
|
||||
"'Note about fast-forwards' section of 'git push --help' for details.\n");
|
||||
"'Note about fast-forwards' section of 'git push --help' for details.\n"));
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
|
|
@ -157,7 +157,7 @@ test_http_push_nonff() {
|
|||
grep "^ ! \[rejected\][ ]*$BRANCH -> $BRANCH (non-fast-forward)$" output
|
||||
'
|
||||
|
||||
test_expect_success 'non-fast-forward push shows help message' '
|
||||
test_expect_success C_LOCALE_OUTPUT 'non-fast-forward push shows help message' '
|
||||
grep "To prevent you from losing history, non-fast-forward updates were rejected" \
|
||||
output
|
||||
'
|
||||
|
|
|
@ -128,11 +128,14 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
|
|||
|
||||
# push master too; this ensures there is at least one '"'push'"' command to
|
||||
# the remote helper and triggers interaction with the helper.
|
||||
test_must_fail git push -v origin +master master:retsam >output 2>&1 &&
|
||||
test_must_fail git push -v origin +master master:retsam >output 2>&1'
|
||||
|
||||
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: remote output' '
|
||||
grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *master -> master (forced update)$" output &&
|
||||
grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output &&
|
||||
grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output
|
||||
'
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
|
||||
grep "To prevent you from losing history, non-fast-forward updates were rejected" \
|
||||
output
|
||||
'
|
||||
|
|
Загрузка…
Ссылка в новой задаче