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