diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-03-23 17:06:11 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-24 02:50:22 -0700 |
| commit | e43b01058222da3fa0ba9b662f6621709a5981b3 (patch) | |
| tree | 78ebc4551ea97c63b29f9a2b5ea99a545c84f133 | |
| parent | b08bbae7e1676e5a47fa9054e268ff14ee819a3a (diff) | |
| download | git-e43b01058222da3fa0ba9b662f6621709a5981b3.tar.gz git-e43b01058222da3fa0ba9b662f6621709a5981b3.tar.xz | |
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>
| -rw-r--r-- | builtin-revert.c | 10 |
1 files changed, 5 insertions, 5 deletions
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 { |