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 16:26:59 -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 1276288037 7209 80.91.229.12 (11 Jun 2010 20:27:17 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 11 Jun 2010 20:27:17 +0000 (UTC) Cc: Juri Linkov , Dan Nicolaescu , emacs-devel@gnu.org To: =?utf-8?B?xaB0xJtww6FuIE7Em21lYw==?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jun 11 22:27:15 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 1ONAos-00062K-4I for ged-emacs-devel@m.gmane.org; Fri, 11 Jun 2010 22:27:14 +0200 Original-Received: from localhost ([127.0.0.1]:53250 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ONAoq-0002Jj-JO for ged-emacs-devel@m.gmane.org; Fri, 11 Jun 2010 16:27:12 -0400 Original-Received: from [140.186.70.92] (port=54032 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ONAok-0002JC-Fi for emacs-devel@gnu.org; Fri, 11 Jun 2010 16:27:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ONAoj-0001Kb-HG for emacs-devel@gnu.org; Fri, 11 Jun 2010 16:27:06 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:42558) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ONAoj-0001KU-Dm; Fri, 11 Jun 2010 16:27:05 -0400 Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id o5BKR0RE030866; Fri, 11 Jun 2010 16:27:00 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 2BEE6B403E; Fri, 11 Jun 2010 16:27:00 -0400 (EDT) In-Reply-To: <874oh94kdh.fsf@gmail.com> (=?utf-8?B?IsWgdMSbcMOhbiBOxJtt?= =?utf-8?B?ZWMiJ3M=?= message of "Fri, 11 Jun 2010 18:14:18 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3555=0 X-detected-operating-system: by eggs.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:125765 Archived-At: >> 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. Stefan