git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ccd71b2)
am: change safe_to_abort()'s not rewinding error into a warning
authorStephan Beyer <redacted>
Wed, 7 Dec 2016 21:51:30 +0000 (22:51 +0100)
committerJunio C Hamano <redacted>
Thu, 8 Dec 2016 17:09:44 +0000 (09:09 -0800)
commit1868331f136cfda63ec3296dad66b48f7e9ffe00
tree5baa5e1a96f9e57c684b7f5ba59dcd7d6835ebb0tree | snapshot
parentccd71b2f38f86a28db2cce811f414fe5369eaa1dcommit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/am.c diff | blob | history
git clone https://git.99rst.org/PROJECT