| commit | 0e6240447c6e0e75e22c30ece7eedb16e1e8ff0b | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 6 Mar 2007 05:46:00 +0000 (6 00:46 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 6 Mar 2007 05:55:31 +0000 (5 21:55 -0800) | ||
| tree | e2682b10b35f994ac555fa92e53a26a9f8fd83b0 | treesnapshot (tar.gz zip) |
| parent | f52463a58275c8dd12b26b02bc0388d015547fcc | commitdiff |
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>
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>
| builtin-revert.c | diffblobblamehistory |