From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 28 Nov 2007 12:41:09 GMT
Subject: Re: [PATCH] Replace misleading message during interactive rebasing
Message-ID: <Pine.LNX.4.64.0711281237250.27959@racer.site>
In-Reply-To: <47D3817B-AA0D-4949-99ED-C36611604D5E@wincent.com>

Hi,

On Wed, 28 Nov 2007, Wincent Colaiuta wrote:

> @@ -352,11 +352,13 @@ static int revert_or_cherry_pick(int argc, const char
> **argv)
> 		}
> 		if (close(msg_fd) || commit_lock_file(&msg_file) < 0)
> 			die ("Error wrapping up %s", defmsg);
> +		help_message = getenv("_GIT_CHERRY_PICK_HELP");
> 		fprintf(stderr, "Automatic %s failed.  "
> 			"After resolving the conflicts,\n"
> 			"mark the corrected paths with 'git add <paths>' "
> -			"and commit the result.\n", me);
> -		if (action == CHERRY_PICK) {
> +			"and %s.\n", me,
> +			help_message ? help_message : "commit the result");
> +		if (action == CHERRY_PICK && !help_message) {
> 			fprintf(stderr, "When commiting, use the option "
> 				"'-c %s' to retain authorship and message.\n",
> 				find_unique_abbrev(commit->object.sha1,

What about Junio's remark that _GIT_CHERRY_PICK_HELP should rather replace 
the _complete_ message?

You could still provide the "me" and unique_abbrev parameters, so that the 
first %s in _GIT_CHERRY_PICK_HELP would be replaced by the operation, and 
the second by the sha1.  Hmm?

Ciao,
Dscho