summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2016-12-07 21:51:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-08 17:09:44 (GMT)
commit1868331f136cfda63ec3296dad66b48f7e9ffe00 (patch)
tree5baa5e1a96f9e57c684b7f5ba59dcd7d6835ebb0
parentccd71b2f38f86a28db2cce811f414fe5369eaa1d (diff)
downloadgit-1868331f136cfda63ec3296dad66b48f7e9ffe00.zip
git-1868331f136cfda63ec3296dad66b48f7e9ffe00.tar.gz
git-1868331f136cfda63ec3296dad66b48f7e9ffe00.tar.bz2
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>
-rw-r--r--builtin/am.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 7cf40e6..826f18b 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;