summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2016-12-07 21:51:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-08 17:09:34 (GMT)
commitccd71b2f38f86a28db2cce811f414fe5369eaa1d (patch)
tree311ff6e61dceee449e71bfac963667224310b0fd /builtin/am.c
parenta274e0a036ea886a31f8b216564ab1b4a3142f6c (diff)
downloadgit-ccd71b2f38f86a28db2cce811f414fe5369eaa1d.zip
git-ccd71b2f38f86a28db2cce811f414fe5369eaa1d.tar.gz
git-ccd71b2f38f86a28db2cce811f414fe5369eaa1d.tar.bz2
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>
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 6981f42..7cf40e6 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);