From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: support for git commit --amend/--signoff Date: Fri, 11 Jun 2010 10:18:34 -0400 Message-ID: References: <87hblavx6f.fsf@mail.jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1276266093 24735 80.91.229.12 (11 Jun 2010 14:21:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 11 Jun 2010 14:21:33 +0000 (UTC) Cc: Juri Linkov , emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jun 11 16:21:32 2010 connect(): No such file or directory Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ON56t-0008Rc-Pq for ged-emacs-devel@m.gmane.org; Fri, 11 Jun 2010 16:21:28 +0200 Original-Received: from localhost ([127.0.0.1]:40344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ON56t-0000sO-5Y for ged-emacs-devel@m.gmane.org; Fri, 11 Jun 2010 10:21:27 -0400 Original-Received: from [140.186.70.92] (port=42420 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ON54O-0007bb-W1 for emacs-devel@gnu.org; Fri, 11 Jun 2010 10:18:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ON54J-0004Dh-CJ for emacs-devel@gnu.org; Fri, 11 Jun 2010 10:18:51 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:50242 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ON548-0004BB-5d; Fri, 11 Jun 2010 10:18:36 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EADriEUxMCqeQ/2dsb2JhbACYToYscr8GhRgEjHo X-IronPort-AV: E=Sophos;i="4.53,403,1272859200"; d="scan'208";a="67843318" Original-Received: from 76-10-167-144.dsl.teksavvy.com (HELO pastel.home) ([76.10.167.144]) by ironport2-out.pppoe.ca with ESMTP; 11 Jun 2010 10:18:35 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id C128D8056; Fri, 11 Jun 2010 10:18:34 -0400 (EDT) In-Reply-To: (Dan Nicolaescu's message of "Fri, 11 Jun 2010 09:23:52 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:125739 Archived-At: > For --amend I think we should have a different mechanism that does not > involve editing the text in the *VC-log* buffer, it's a more > destructive operation and it's not a good idea to allow the user to do > it by mistake by just placing an Amend: line in the buffer. You might be right, but I don't think it would be terribly bad to have it be editable in the buffer (after all it's also just an "--amend" away when committing on the command line). I'm not sure what UI you're considering to use and what users would want, because I've never used Git's amend feature. But I think it should be considered in the light of similar functionality in other VCS, such as maybe "cvs admin -m" and DaRCS's "amend-record". For PCL-CVS what I offered was a way to edit a log-message (typically called from the log-view buffer). But admittedly, "cvs admin -m" is a fairly different beast from Git's amend. If we only consider Git's and DaRCS's forms of amend, I'd say that the "Amend:" header might be a good approach, and that it should specify the revision/patch that's amended. So for Git, you could have a command that inserts "Amend: " and then the backend could check that the SHA-1 is the right one (which would avoid accidental use). Stefan