When cherry-pick fails after picking a large series of commits, it can
be hard to pick out the error message and advice. Clarify the error
and prefix it with “error: ” to help.
Before:
Automatic cherry-pick failed. [...advice...]
After:
error: could not apply 7ab78c9... Do something neat.
[...advice...]
Noticed-by: Thomas Rast <trast@xxxxxxxxxxxxxxx>
Encouraged-by: Sverre Rabbelier <srabbelier@xxxxxxxxx>
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
builtin/revert.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 74c1581..9a7483b 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)
--
1.7.2.1.544.ga752d.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html