[PATCH v5 09/11] i18n: factorize "--foo outside a repository"
From: Jean-Noël Avila via GitGitGadget <hidden>
Date: 2022-01-05 20:03:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <redacted> Signed-off-by: Jean-Noël Avila <redacted> --- apply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apply.c b/apply.c
index cabcdbe425a..5cd369d5736 100644
--- 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))
--
gitgitgadget