From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: support for git commit --amend/--signoff Date: Fri, 11 Jun 2010 22:19:18 -0400 Message-ID: References: <87hblavx6f.fsf@mail.jurta.org> <874oh94kdh.fsf@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1276309170 29643 80.91.229.12 (12 Jun 2010 02:19:30 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 12 Jun 2010 02:19:30 +0000 (UTC) Cc: Juri Linkov , =?utf-8?B?xaB0xJtww6FuIE7Em21lYw==?= , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 12 04:19:29 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 1ONGJi-0006Zj-7i for ged-emacs-devel@m.gmane.org; Sat, 12 Jun 2010 04:19:26 +0200 Original-Received: from localhost ([127.0.0.1]:35134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ONGJh-0002Pp-La for ged-emacs-devel@m.gmane.org; Fri, 11 Jun 2010 22:19:25 -0400 Original-Received: from [199.232.76.173] (port=40675 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ONGJc-0002Pk-TH for emacs-devel@gnu.org; Fri, 11 Jun 2010 22:19:20 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1ONGJb-0008OU-Nd for emacs-devel@gnu.org; Fri, 11 Jun 2010 22:19:20 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:52251) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1ONGJb-0008OP-HK for emacs-devel@gnu.org; Fri, 11 Jun 2010 22:19:19 -0400 Original-Received: from dann by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1ONGJa-0005MH-Qv; Fri, 11 Jun 2010 22:19:18 -0400 In-Reply-To: (Stefan Monnier's message of "Fri\, 11 Jun 2010 16\:26\:59 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:125777 Archived-At: Stefan Monnier writes: >>> 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). > >> No idea about Darcs, but `git commit --amend' always changes the tip of >> the current branch, you can't specify another commit to amend; > > I know that (and DaRCS doesn't have such a limitation). >> so the above would not be useful in this case (same for --signoff). > > It is not useful but it is needed because an empty header is normally > the same as no header, so just "Amend:" can't be enough, we'd have to > put something there. I suggested a SHA-1 just because Dan though there > was a risk of people writing the header by mistake. That would be a very strong argument agains doing it that way for amend then. Coupled with the fact that for amend we actually want to insert the previous comit log, that calls for a different solution. We could have a log-edit-extra-flags function that computes a set of extra flags, and pass those flags to vc-git-checkin.