From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Dec 2008 03:03:46 GMT
Subject: Re: [PATCH] Make git revert warn the user when reverting a merge commit.
Message-ID: <7vej04eui5.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <alpine.DEB.1.00.0812190353520.14632@racer>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Wow.  That must be one of the, uhm, less beautiful ways to write
>
> 		if (action == REVERT)
> 			warning("revert on a merge commit may not do what you "
> 				"expect.");
> 		else if (action != CHERRY_PICK)
> 			die("Unknown action on a merge commit.");
>
> Besides, I am actually pretty much against this change.  You already have 
> to ask very explicitely to revert a merge, by specifying a parent number.  
> If I ask for something explicitely, I do not want the tool to tell me that 
> it's dangerous.  I know that already, thankyouverymuch.

Or you may not have known that it is dangerous, but the new warning does
not give you enough clue where to go next, so this warning does not give
real value.  It is pretty much meaningless noise to users.