Skip to content

Commit 59bb000

Browse files
jnavilagitster
authored andcommitted
i18n: factorize "--foo outside a repository"
Signed-off-by: Jean-Noël Avila <[email protected]> Reviewed-by: Johannes Sixt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 68e2ea0 commit 59bb000

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

apply.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ int check_apply_state(struct apply_state *state, int force_apply)
136136
return error(_("options '%s' and '%s' cannot be used together"), "--reject", "--3way");
137137
if (state->threeway) {
138138
if (is_not_gitdir)
139-
return error(_("--3way outside a repository"));
139+
return error(_("'%s' outside a repository"), "--3way");
140140
state->check_index = 1;
141141
}
142142
if (state->apply_with_reject) {
@@ -147,10 +147,10 @@ int check_apply_state(struct apply_state *state, int force_apply)
147147
if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
148148
state->apply = 0;
149149
if (state->check_index && is_not_gitdir)
150-
return error(_("--index outside a repository"));
150+
return error(_("'%s' outside a repository"), "--index");
151151
if (state->cached) {
152152
if (is_not_gitdir)
153-
return error(_("--cached outside a repository"));
153+
return error(_("'%s' outside a repository"), "--cached");
154154
state->check_index = 1;
155155
}
156156
if (state->ita_only && (state->check_index || is_not_gitdir))

0 commit comments

Comments
 (0)