summaryrefslogtreecommitdiff
path: root/builtin-revert.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-03-06 05:46:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-06 05:55:31 (GMT)
commit0e6240447c6e0e75e22c30ece7eedb16e1e8ff0b (patch)
treee2682b10b35f994ac555fa92e53a26a9f8fd83b0 /builtin-revert.c
parentf52463a58275c8dd12b26b02bc0388d015547fcc (diff)
downloadgit-0e6240447c6e0e75e22c30ece7eedb16e1e8ff0b.zip
git-0e6240447c6e0e75e22c30ece7eedb16e1e8ff0b.tar.gz
git-0e6240447c6e0e75e22c30ece7eedb16e1e8ff0b.tar.bz2
cherry-pick: Bug fix 'cherry picked from' message.
Somewhere along the line (in abd6970a) git-revert.sh learned to omit the private object name from the new commit message *unless* -x was supplied on the command line by the user. The way this was implemented is really non-obvious in the original script. Setting replay=t (the default) means we don't include the the private object name, while setting reply='' (the -x flag) means we should include the private object name. These two settings now relate to the replay=1 and replay=0 cases in the C version, so we need to negate replay to test it is 0. I also noticed the C version was adding an extra LF in the -x case, where the older git-revert.sh was not. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-revert.c')
-rw-r--r--builtin-revert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-revert.c b/builtin-revert.c
index 382fe0c..2f2dc1b 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -303,8 +303,8 @@ static int revert_or_cherry_pick(int argc, const char **argv)
next = commit;
set_author_ident_env(message);
add_message_to_msg(message);
- if (replay) {
- add_to_msg("\n(cherry picked from commit ");
+ if (!replay) {
+ add_to_msg("(cherry picked from commit ");
add_to_msg(sha1_to_hex(commit->object.sha1));
add_to_msg(")\n");
}