Re: [PATCH 1/5] am: Fix filename in safe_to_abort() error message

From: Paul Tan <pyokagan@gmail.com>
Date: Dec 8, 2016, 10:21 UTC
Message-ID: <CACRoPnSzHo2wqZyP6nfMaZBCy9-m6E72vTGRTjGcuSdo-qJ4dw@mail.gmail.com>
In-Reply-To: <20161207215133.13433-1-s-beyer@gmx.net>

Hi Stephan,

On Thu, Dec 8, 2016 at 5:51 AM, Stephan Beyer <s-beyer@gmx.net> wrote:

Show 10 quoted lines

> diff --git a/builtin/am.c b/builtin/am.c
> index 6981f42ce..7cf40e6f2 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -2124,7 +2124,7 @@ static int safe_to_abort(const struct am_state *state)
>
>         if (read_state_file(&sb, state, "abort-safety", 1) > 0) {
>                 if (get_oid_hex(sb.buf, &abort_safety))
> -                       die(_("could not parse %s"), am_path(state, "abort_safety"));
> +                       die(_("could not parse %s"), am_path(state, "abort-safety"));

Ah, this is obviously correct. Sorry for the oversight.

Show 5 quoted lines

>         } else
>                 oidclr(&abort_safety);
>
> --
> 2.11.0.27.g4eed97c

Thanks, Paul