]> git.ipfire.org Git - thirdparty/git.git/commitdiff
am: fix filename in safe_to_abort() error message
authorStephan Beyer <s-beyer@gmx.net>
Wed, 7 Dec 2016 21:51:29 +0000 (22:51 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Dec 2016 17:09:34 +0000 (09:09 -0800)
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/am.c

index 6981f42ce986dc5a9fa76bed8364cee7c6c642aa..7cf40e6f2796f641b5ca075d9c93b54a1b33ff9f 100644 (file)
@@ -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);