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

[Paul Tan]

Hi Stephan,

On Thu, Dec 8, 2016 at 5:51 AM, Stephan Beyer  wrote:
> 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(, state, "abort-safety", 1) > 0) {
> if (get_oid_hex(sb.buf, _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.

> } else
> oidclr(_safety);
>
> --
> 2.11.0.27.g4eed97c

Thanks,
Paul

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

[Stephan Beyer]

Signed-off-by: Stephan Beyer 
---
 Okay let's give it a try. Some minor things that I found
 are also in this patchset (patch 01, 02 and 05).
 The branch can also be found on
   https://github.com/sbeyer/git/commits/sequencer-abort-safety

 builtin/am.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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(, state, "abort-safety", 1) > 0) {
if (get_oid_hex(sb.buf, _safety))
-   die(_("could not parse %s"), am_path(state, 
"abort_safety"));
+   die(_("could not parse %s"), am_path(state, 
"abort-safety"));
} else
oidclr(_safety);
 
-- 
2.11.0.27.g4eed97c