git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Boyd Stephen Smith Jr." <bss@iguanasuicide.net>, git@vger.kernel.org
Subject: Re: [PATCH] Make git revert warn the user when reverting a merge commit.
Date: Thu, 18 Dec 2008 19:03:46 -0800	[thread overview]
Message-ID: <7vej04eui5.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0812190353520.14632@racer> (Johannes Schindelin's message of "Fri, 19 Dec 2008 03:57:57 +0100 (CET)")

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.

  reply	other threads:[~2008-12-19  3:05 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-19  2:39 [PATCH] Make git revert warn the user when reverting a merge commit Boyd Stephen Smith Jr.
2008-12-19  2:57 ` Johannes Schindelin
2008-12-19  3:03   ` Junio C Hamano [this message]
2008-12-19  3:29     ` Boyd Stephen Smith Jr.
2008-12-19  3:55       ` Jay Soffian
2008-12-19  5:54         ` Boyd Stephen Smith Jr.
2008-12-19  6:35           ` Junio C Hamano
2008-12-19 18:07       ` Alan
2008-12-19  3:24   ` Boyd Stephen Smith Jr.
2008-12-20  7:08 ` Robin Rosenberg
2008-12-20 22:54   ` Boyd Stephen Smith Jr.
2008-12-20 23:31     ` Robin Rosenberg
2008-12-21  2:37       ` Junio C Hamano
2008-12-21  3:11         ` Boyd Stephen Smith Jr.
2008-12-21 10:09           ` Robin Rosenberg
2008-12-21 10:59             ` Junio C Hamano
2008-12-21 19:59             ` Boyd Stephen Smith Jr.
2008-12-21 20:23               ` Junio C Hamano
2008-12-21 21:13                 ` Boyd Stephen Smith Jr.
2008-12-21 22:17                   ` Junio C Hamano
2008-12-21 22:38                     ` Junio C Hamano
2008-12-21 22:40                     ` Robin Rosenberg
2008-12-21 22:46                       ` Junio C Hamano
2008-12-21 22:56                         ` Robin Rosenberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vej04eui5.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=bss@iguanasuicide.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).