From: Stephan Beyer <s-beyer@gmx.net>
Date: Wed, 7 Dec 2016 21:51:29 +0000 (+0100)
Subject: am: fix filename in safe_to_abort() error message
X-Git-Tag: v2.11.1~47^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ccd71b2f38f86a28db2cce811f414fe5369eaa1d

am: fix filename in safe_to_abort() error message

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/am.c b/builtin/am.c
index 6981f42ce9..7cf40e6f27 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"));
 	} else
 		oidclr(&abort_safety);