From ccd71b2f38f86a28db2cce811f414fe5369eaa1d Mon Sep 17 00:00:00 2001 From: Stephan Beyer Date: Wed, 7 Dec 2016 22:51:29 +0100 Subject: am: fix filename in safe_to_abort() error message Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano --- builtin/am.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin') 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); -- cgit v1.2.3 From 1868331f136cfda63ec3296dad66b48f7e9ffe00 Mon Sep 17 00:00:00 2001 From: Stephan Beyer Date: Wed, 7 Dec 2016 22:51:30 +0100 Subject: am: change safe_to_abort()'s not rewinding error into a warning The error message tells the user that something went terribly wrong and the --abort could not be performed. But the --abort is performed, only without rewinding. By simply changing the error into a warning, we indicate the user that she must not try something like "git am --abort --force", instead she just has to check the HEAD. Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano --- builtin/am.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin') diff --git a/builtin/am.c b/builtin/am.c index 7cf40e6f27..826f18ba12 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2134,7 +2134,7 @@ static int safe_to_abort(const struct am_state *state) if (!oidcmp(&head, &abort_safety)) return 1; - error(_("You seem to have moved HEAD since the last 'am' failure.\n" + warning(_("You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD")); return 0; -- cgit v1.2.3