On Sun, Apr 24, 2016 at 8:34 PM, Christian Couder
<christian.cou...@gmail.com> wrote:
> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
> ---
> builtin/apply.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/builtin/apply.c b/builtin/apply.c
> index e3ee199..7576ec5 100644
> --- a/builtin/apply.c
> +++ b/builtin/apply.c
> @@ -4534,17 +4534,17 @@ static int option_parse_directory(const struct option
> *opt,
> return 0;
> }
>
> -static void check_apply_state(struct apply_state *state, int force_apply)
> +static int check_apply_state(struct apply_state *state, int force_apply)
> {
> int is_not_gitdir = !startup_info->have_repository;
>
> if (state->apply_with_reject && state->threeway)
> - die("--reject and --3way cannot be used together.");
> + return error("--reject and --3way cannot be used together.");
> if (state->cached && state->threeway)
> - die("--cached and --3way cannot be used together.");
> + return error("--cached and --3way cannot be used together.");
Sweet opportunity to _() these messages since it clear shows in this
patch that other messages of the same category are _()'d in this
function. Could be done as a separate patch. But I'm also ok if you
say "no".
> if (state->threeway) {
> if (is_not_gitdir)
> - die(_("--3way outside a repository"));
> + return error(_("--3way outside a repository"));
> state->check_index = 1;
> }
> if (state->apply_with_reject)
> @@ -4552,14 +4552,15 @@ static void 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)
> - die(_("--index outside a repository"));
> + return error(_("--index outside a repository"));
> if (state->cached) {
> if (is_not_gitdir)
> - die(_("--cached outside a repository"));
> + return error(_("--cached outside a repository"));
> state->check_index = 1;
> }
> if (state->check_index)
> state->unsafe_paths = 0;
> + return 0;
> }
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
