On Saturday 2008 December 20 01:08:01 Robin Rosenberg wrote:
> fredag 19 december 2008 03:39:15 skrev Boyd Stephen Smith Jr.:
> > On Thursday 2008 December 18 18:21:25 Linus Torvalds wrote:
> > > I suspect we should warn about reverting merges.
>
> Or mention the reverted parent in the commit message since it is not
> obvious.
>
> ---
> builtin-revert.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/builtin-revert.c b/builtin-revert.c
> index 4038b41..fc59229 100644
> --- a/builtin-revert.c
> +++ b/builtin-revert.c
> @@ -352,6 +352,10 @@ static int revert_or_cherry_pick(int argc, const char
> **argv) add_to_msg(oneline_body + 1);
> add_to_msg("\"\n\nThis reverts commit ");
> add_to_msg(sha1_to_hex(commit->object.sha1));
> + if (commit->parents->next) {
> + add_to_msg(" removing\ncontributions from ");
> + add_to_msg(sha1_to_hex(parent->object.sha1));
> + }
> add_to_msg(".\n");
> } else {
> base = parent;
I'm still new to the code, but parent is the "mainline" specified on the
command-line, which (I think) is actually the parent to be reverted to, so we
are actually removing contributions from all the *other* parents. So, the
message may be backward. Because of that, I'd say the patch doesn't handle
octopus merges well, either.
--
Boyd Stephen Smith Jr. ,= ,-_-. =.
bss@xxxxxxxxxxxxxxxxx ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'
http://iguanasuicide.net/ \_/
Attachment:
signature.asc
Description: This is a digitally signed message part.
