From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Fri, 23 Mar 2007 16:06:11 +0000 (+0100)
Subject: git-revert: Revert revert message to old behaviour
X-Git-Tag: v1.5.1-rc2~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e43b01058222da3fa0ba9b662f6621709a5981b3;p=git.git

git-revert: Revert revert message to old behaviour

When converting from the shell script, based on a misreading of the
sed invocation, the builtin included the abbreviated commit name,
and did _not_ include the quotes around the oneline message.

This fixes it.

[jc: with a fix for the typo/thinko spotted by Linus, and also
 removing the unwanted abbrev at the beginning.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-revert.c b/builtin-revert.c
index f3f3f5c6e..4ba0ee63a 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -294,13 +294,13 @@ static int revert_or_cherry_pick(int argc, const char **argv)
 	oneline = get_oneline(message);
 
 	if (action == REVERT) {
+		char *oneline_body = strchr(oneline, ' ');
+
 		base = commit;
 		next = commit->parents->item;
-		add_to_msg("Revert ");
-		add_to_msg(find_unique_abbrev(commit->object.sha1,
-					DEFAULT_ABBREV));
-		add_to_msg(oneline);
-		add_to_msg("\nThis reverts commit ");
+		add_to_msg("Revert \"");
+		add_to_msg(oneline_body + 1);
+		add_to_msg("\"\n\nThis reverts commit ");
 		add_to_msg(sha1_to_hex(commit->object.sha1));
 		add_to_msg(".\n");
 	} else {