mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
68e2ea0b30
commit
59bb00090e
6
apply.c
6
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))
|
||||
|
|
Loading…
Reference in a new issue