]> git.ipfire.org Git - thirdparty/git.git/commitdiff
i18n: factorize "--foo outside a repository"
authorJean-Noël Avila <jn.avila@free.fr>
Wed, 5 Jan 2022 20:02:22 +0000 (20:02 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2022 21:31:00 +0000 (13:31 -0800)
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
apply.c

diff --git a/apply.c b/apply.c
index cabcdbe425a56a5fc0d222ffbd9bc1ae15074b9f..5cd369d57363e207eb50ad6b16b5d1227e8e90fb 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -136,7 +136,7 @@ int check_apply_state(struct apply_state *state, int force_apply)
                return error(_("options '%s' and '%s' cannot be used together"), "--reject", "--3way");
        if (state->threeway) {
                if (is_not_gitdir)
-                       return error(_("--3way outside a repository"));
+                       return error(_("'%s' outside a repository"), "--3way");
                state->check_index = 1;
        }
        if (state->apply_with_reject) {
@@ -147,10 +147,10 @@ int check_apply_state(struct apply_state *state, int force_apply)
        if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
                state->apply = 0;
        if (state->check_index && is_not_gitdir)
-               return error(_("--index outside a repository"));
+               return error(_("'%s' outside a repository"), "--index");
        if (state->cached) {
                if (is_not_gitdir)
-                       return error(_("--cached outside a repository"));
+                       return error(_("'%s' outside a repository"), "--cached");
                state->check_index = 1;
        }
        if (state->ita_only && (state->check_index || is_not_gitdir))