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 <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephan Beyer committed
Dec 7, 2016 at 22:51 UTC
1868331f136cfda63ec3296dad66b48f7e9ffe00
1 file changed
+1
-1
builtin/am.c
+1
-1
@@ -2134,7 +2134,7 @@ static int safe_to_abort(const struct am_state *state)
2134
if (!oidcmp(&head, &abort_safety))
2135
return 1;
2136
2137
- error(_("You seem to have moved HEAD since the last 'am' failure.\n"
2137
+ warning(_("You seem to have moved HEAD since the last 'am' failure.\n"
2138
"Not rewinding to ORIG_HEAD"));
2139
2140
return 0;