summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:42:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-10 07:52:56 (GMT)
commitb32227e770f6c8ade19d340118a478f8b1a8659d (patch)
treee21c578e571c51ff4b5cdba5e503e7591fcf02ab /builtin/push.c
parent8352d29e00a307698a3438ce4c094827c6f5dcaf (diff)
downloadgit-b32227e770f6c8ade19d340118a478f8b1a8659d.zip
git-b32227e770f6c8ade19d340118a478f8b1a8659d.tar.gz
git-b32227e770f6c8ade19d340118a478f8b1a8659d.tar.bz2
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>
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 513bc57..8c8d8c7 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -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;