Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin/revert.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index 74c1581fdc..9a7483b66f 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -524,8 +524,11 @@ static int do_pick_commit(void)
}
if (res) {
- fprintf(stderr, "Automatic %s failed.%s\n",
- mebuf.buf, help_msg());
+ error("could not %s %s... %s",
+ action == REVERT ? "revert" : "apply",
+ find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
+ msg.subject);
+ fprintf(stderr, help_msg());
rerere(allow_rerere_auto);
} else {
if (!no_commit)