undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cherry-pick/revert: Use error() for failure message

Browse Source 
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>
This commit is contained in:
Jonathan Nieder 2010-08-11 03:37:24 -05:00 committed by Junio C Hamano
parent 2a41dfb03b
commit 981ff5c37a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/revert.c
View File

@ -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)