@matheusbsbs / matheus-bagliano / commits / 0e6240447c
Fork 0

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>

Shawn O. Pearce committed Mar 6, 2007 at 00:46 UTC 0e6240447c6e0e75e22c30ece7eedb16e1e8ff0b
1 file changed +2 -2
builtin-revert.c
+2 -2
@@ -303,8 +303,8 @@ static int revert_or_cherry_pick(int argc, const char **argv)
303 next = commit;
304 set_author_ident_env(message);
305 add_message_to_msg(message);
306 - if (replay) {
307 - add_to_msg("\n(cherry picked from commit ");
306 + if (!replay) {
307 + add_to_msg("(cherry picked from commit ");
308 add_to_msg(sha1_to_hex(commit->object.sha1));
309 add_to_msg(")\n");
310 }