diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-11 03:37:24 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-15 19:12:07 -0700 |
| commit | 981ff5c37ae20687c98d98c8689d5e89016026d2 (patch) | |
| tree | 868d1a043744c3eb2b744618038fc921fbcae1e5 /builtin | |
| parent | 2a41dfb03b93c3e5b7d1deca537276aed063a044 (diff) | |
| download | git-981ff5c37ae20687c98d98c8689d5e89016026d2.tar.gz git-981ff5c37ae20687c98d98c8689d5e89016026d2.tar.xz | |
cherry-pick/revert: Use error() for failure message
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@student.ethz.ch>
Encouraged-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/revert.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 74c1581fd..9a7483b66 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) |