From: Stephan Beyer Date: Wed, 7 Dec 2016 21:51:30 +0000 (+0100) Subject: am: change safe_to_abort()'s not rewinding error into a warning X-Git-Tag: v2.11.1~47^2~4 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1868331f136cfda63ec3296dad66b48f7e9ffe00;p=git-core%2Fgit.git 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 --- diff --git a/builtin/am.c b/builtin/am.c index 7cf40e6f2..826f18ba1 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;