[PATCH v2 2/5] am: Change safe_to_abort()'s not rewinding error into a warning
- From
Stephan Beyer <s-beyer@gmx.net>
- Date
- Dec 9, 2016, 19:01 UTC
- Message-ID
- <20161209190111.9571-2-s-beyer@gmx.net>
- In-Reply-To
- <20161209190111.9571-1-s-beyer@gmx.net>
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> --- builtin/am.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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;
-- 2.11.0.27.g74d6bea