diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 20:02:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 21:31:00 (GMT) |
| commit | 59bb00090eb63434d46ee0ffa37482ba419aebb1 (patch) | |
| tree | 0d1154273ca497bd2ae2993a5d69e9c514c4b844 /apply.c | |
| parent | 68e2ea0b3070d25d28fbaadc53aea25d028abf82 (diff) | |
| download | git-59bb00090eb63434d46ee0ffa37482ba419aebb1.zip git-59bb00090eb63434d46ee0ffa37482ba419aebb1.tar.gz git-59bb00090eb63434d46ee0ffa37482ba419aebb1.tar.bz2 | |
i18n: factorize "--foo outside a repository"
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>
Diffstat (limited to 'apply.c')
| -rw-r--r-- | apply.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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)) |