From unknown Mon Aug 18 00:05:47 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#12537 <12537@debbugs.gnu.org> To: bug#12537 <12537@debbugs.gnu.org> Subject: Status: support for git commit --amend/--signoff Reply-To: bug#12537 <12537@debbugs.gnu.org> Date: Mon, 18 Aug 2025 07:05:47 +0000 retitle 12537 support for git commit --amend/--signoff reassign 12537 emacs submitter 12537 Dmitry Gutov severity 12537 wishlist tag 12537 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 28 20:12:12 2012 Received: (at submit) by debbugs.gnu.org; 29 Sep 2012 00:12:12 +0000 Received: from localhost ([127.0.0.1]:32833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1THkfD-0007C4-7v for submit@debbugs.gnu.org; Fri, 28 Sep 2012 20:12:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51296) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1THkf9-0007Bu-R1 for submit@debbugs.gnu.org; Fri, 28 Sep 2012 20:12:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THkew-0006mQ-CB for submit@debbugs.gnu.org; Fri, 28 Sep 2012 20:11:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:60749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THkew-0006mM-4N for submit@debbugs.gnu.org; Fri, 28 Sep 2012 20:11:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THkeu-0005xh-VB for bug-gnu-emacs@gnu.org; Fri, 28 Sep 2012 20:11:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THket-0006lC-As for bug-gnu-emacs@gnu.org; Fri, 28 Sep 2012 20:11:52 -0400 Received: from forward12.mail.yandex.net ([95.108.130.94]:59106) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THkes-0006l8-R5 for bug-gnu-emacs@gnu.org; Fri, 28 Sep 2012 20:11:51 -0400 Received: from smtp13.mail.yandex.net (smtp13.mail.yandex.net [95.108.130.68]) by forward12.mail.yandex.net (Yandex) with ESMTP id BE721C22A28 for ; Sat, 29 Sep 2012 04:11:38 +0400 (MSK) Received: from smtp13.mail.yandex.net (localhost [127.0.0.1]) by smtp13.mail.yandex.net (Yandex) with ESMTP id AB0A7E405AD for ; Sat, 29 Sep 2012 04:11:38 +0400 (MSK) Received: from 5x166x253x130.dynamic.spb.ertelecom.ru (5x166x253x130.dynamic.spb.ertelecom.ru [5.166.253.130]) by smtp13.mail.yandex.net (nwsmtp/Yandex) with ESMTP id BbmCcVEF-Bcmmsv6b; Sat, 29 Sep 2012 04:11:38 +0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1348877498; bh=2pd9rbcEOa+zuwrf29qoZc/8QI6T4mg4P6PF3iaaopI=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Content-Transfer-Encoding; b=LCwHxcYlPOS1WLVgotMKXenLbz9AyKkyj79pwXJAtaxIod5Lz+z7WppKEzZ96ZPjb syFbXMl+b9A5KH6H6Jfv8/ad22w3AAmG/2MPH2BW3RcoQMjKaeIpk92fXyaRCOCPYW fGi2H4lmEgZBo4QtWb55Vamo/M0iw/1mJ3tYVVu8= Message-ID: <50663CC0.6000803@yandex.ru> Date: Sat, 29 Sep 2012 04:11:44 +0400 From: Dmitry Gutov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: bug-gnu-emacs@gnu.org Subject: support for git commit --amend/--signoff Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.2 (------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.2 (------) Tags: patch This is based on Dan Nicolaescu's patch from here: http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00784.html I modified it according to Stefan's request, and made some other tweaks. Notes: 1) Magit handles the Amend action in a similar way: it also inserts a header at the top of the message edit buffer. I haven't seen any complaints from users. 2) I haven't been able to make menu-bar keymap work as intended. I copied log-edit-menu to the local menu-map variable, and it shows, but if I don't set the parent keymap of vc-git-log-edit-mode-map to log-edit-mode-map, the menu popup doesn't show the latter's keybindings (and they likely don't work, haven't tried). If I do set it as parent, then the "*VC-log*" mode line element menu only contains two elements, but submenus, one for each keymap. I don't think that's optimal, so I discarded the menu-map part altogether. 3) Toggling Amend on/off repeatedly may lead to slightly different behavior if the commit message subject looks like a "header: value" string, and especially if that's the only line in the message. The difference would be in the added newlines, and the commit subject will become highlighted as a header line. To counteract this, Magit inserts a "-- magit header ends here --" line after the headers. Not sure if we should do the same. 4) The new first argument format of log-edit-extract-headers is kinda awkward, but it's the only way I could think of to make it backwards-compatible, and I do think that this is the function that should handle the yes/no headers logic. The third element in the new form ("yes") is more or less superfluous (we could just hardcode it everywhere as the only possible value for "true"), but without it, the new form would look even more awkward. Suggestions welcome. --Dmitry From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 28 20:14:28 2012 Received: (at 12537) by debbugs.gnu.org; 29 Sep 2012 00:14:28 +0000 Received: from localhost ([127.0.0.1]:32842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1THkhP-0007Fu-R4 for submit@debbugs.gnu.org; Fri, 28 Sep 2012 20:14:28 -0400 Received: from forward11.mail.yandex.net ([95.108.130.93]:45601) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1THkhM-0007Fl-Mq for 12537@debbugs.gnu.org; Fri, 28 Sep 2012 20:14:26 -0400 Received: from smtp13.mail.yandex.net (smtp13.mail.yandex.net [95.108.130.68]) by forward11.mail.yandex.net (Yandex) with ESMTP id 5C496E83339 for <12537@debbugs.gnu.org>; Sat, 29 Sep 2012 04:14:10 +0400 (MSK) Received: from smtp13.mail.yandex.net (localhost [127.0.0.1]) by smtp13.mail.yandex.net (Yandex) with ESMTP id 48691E405AD for <12537@debbugs.gnu.org>; Sat, 29 Sep 2012 04:14:10 +0400 (MSK) Received: from 5x166x253x130.dynamic.spb.ertelecom.ru (5x166x253x130.dynamic.spb.ertelecom.ru [5.166.253.130]) by smtp13.mail.yandex.net (nwsmtp/Yandex) with ESMTP id E9mWYd3J-E9mmmYCf; Sat, 29 Sep 2012 04:14:10 +0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1348877650; bh=6UcEqPQsWJGjuYlskFEba1okRIdxyKsbGZU0L7hEwVM=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: References:In-Reply-To:Content-Type; b=a5zDUG6oqnhp5PgHMc3PrnS8H1S7pijKcoin6r0fh+vTG1s16+zdg0kWeMeVb9JN0 Ds58aJODIvssaow7hB4bC+pdoy+Wx1c5azvUTbKxpQk+hkcnqmTcrWP19awxMZw8hY Df++55m/odd2tV+Ep3p3pNheuAos2Ulj/0ciWYrk= Message-ID: <50663D58.4010702@yandex.ru> Date: Sat, 29 Sep 2012 04:14:16 +0400 From: Dmitry Gutov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: 12537@debbugs.gnu.org Subject: Re: bug#12537: Acknowledgement (support for git commit --amend/--signoff) References: <50663CC0.6000803@yandex.ru> In-Reply-To: Content-Type: multipart/mixed; boundary="------------090604080805030603090605" X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 12537 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) This is a multi-part message in MIME format. --------------090604080805030603090605 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sorry, here's the patch. --------------090604080805030603090605 Content-Type: text/plain; charset=windows-1251; name="amend.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="amend.diff" PT09IG1vZGlmaWVkIGZpbGUgJ2xpc3AvQ2hhbmdlTG9nJwotLS0gbGlzcC9DaGFuZ2VMb2cJ MjAxMi0wOS0yMiAxNToyNDoyNiArMDAwMAorKysgbGlzcC9DaGFuZ2VMb2cJMjAxMi0wOS0y OCAyMzo0NzoxOCArMDAwMApAQCAtMSwzICsxLDE4IEBACisyMDEyLTA5LTI4ICBEbWl0cnkg R3V0b3YgIDxkZ3V0b3ZAeWFuZGV4LnJ1PgorCisJKiB2Yy92Yy1naXQuZWwgKHZjLWdpdC1s b2ctZWRpdC10b2dnbGUtc2lnbm9mZik6IE5ldyBmdW5jdGlvbi4KKwkodmMtZ2l0LWxvZy1l ZGl0LXRvZ2dsZS1hbWVuZCk6IE5ldyBmdW5jdGlvbi4KKwkodmMtZ2l0LWxvZy1lZGl0LXRv Z2dsZS1zaWdub2ZmKTogTmV3IGZ1bmN0aW9uLgorCSh2Yy1naXQtbG9nLWVkaXQtbW9kZSk6 IE5ldyBtYWpvciBtb2RlLgorCSh2Yy1naXQtbG9nLWVkaXQtbW9kZS1tYXApOiBLZXltYXAg Zm9yIGl0LgorCSh2Yy1naXQtY2hlY2tpbik6IEhhbmRsZSAiQW1lbmQiIGFuZCAiU2lnbi1P ZmYiIGhlYWRlcnMuCisKKwkqIHZjL2xvZy1lZGl0LmVsIChsb2ctZWRpdC1mb250LWxvY2st a2V5d29yZHMpOiBBbGxvdyBub24tbGV0dGVyCisJY2hhcmFjdGVycyBpbiBoZWFkZXIgbmFt ZXMsIGxpa2UgaHlwaGVucy4KKwkobG9nLWVkaXQtdG9nZ2xlLWhlYWRlcik6IE5ldyBmdW5j dGlvbi4KKwkobG9nLWVkaXQtZXh0cmFjdC1oZWFkZXJzKTogQWNjZXB0IGFuIGFsdGVybmF0 aXZlIGZvcm0gb2YgdGhlCisJZmlyc3QgYXJndW1lbnQncyBlbGVtZW50cywgYWxsb3dpbmcg dG8gaGFuZGxlIHllcy9ubyBoZWFkZXJzLgorCiAyMDEyLTA5LTIyICBDaG9uZyBZaWRvbmcg IDxjeWRAZ251Lm9yZz4KIAogCSogcmVwZWF0LmVsIChyZXBlYXQpOiBEb2MgZml4IChCdWcj MTIzNDgpLgoKPT09IG1vZGlmaWVkIGZpbGUgJ2xpc3AvdmMvbG9nLWVkaXQuZWwnCi0tLSBs aXNwL3ZjL2xvZy1lZGl0LmVsCTIwMTItMDgtMjggMTY6MDE6NTkgKzAwMDAKKysrIGxpc3Av dmMvbG9nLWVkaXQuZWwJMjAxMi0wOS0yOCAyMzoxNzoxMCArMDAwMApAQCAtMzUyLDcgKzM1 Miw4IEBACiAoZGVmdmFyIGxvZy1lZGl0LWZvbnQtbG9jay1rZXl3b3JkcwogICA7OyBDb3Bp ZWQvaW5zcGlyZWQgYnkgbWVzc2FnZS1mb250LWxvY2sta2V5d29yZHMuCiAgIGAoKGxvZy1l ZGl0LW1hdGNoLXRvLWVvaAotICAgICAoLChjb25jYXQgIl5cXChcXChbWzphbHBoYTpdXStc XCk6XFwpIiBsb2ctZWRpdC1oZWFkZXItY29udGVudHMtcmVnZXhwKQorICAgICAoLChjb25j YXQgIl5cXChcXChbWzphbHBoYTpdXVteOiBcblx0XStcXCk6XFwpIgorICAgICAgICAgICAg ICAgbG9nLWVkaXQtaGVhZGVyLWNvbnRlbnRzLXJlZ2V4cCkKICAgICAgIChwcm9nbiAoZ290 by1jaGFyIChtYXRjaC1iZWdpbm5pbmcgMCkpIChtYXRjaC1lbmQgMCkpIG5pbAogICAgICAg KDEgKGlmIChhc3NvYyAobWF0Y2gtc3RyaW5nIDIpIGxvZy1lZGl0LWhlYWRlcnMtYWxpc3Qp CiAgICAgICAgICAgICAgJ2xvZy1lZGl0LWhlYWRlcgpAQCAtOTA4LDEyICs5MDksNDcgQEAK ICAgICAgIChpbnNlcnQgIlxuIikpCiAgICAgbG9nLWVkaXQtYXV0aG9yKSkKIAorKGRlZnVu IGxvZy1lZGl0LXRvZ2dsZS1oZWFkZXIgKG5hbWUgdmFsdWUpCisgICJUb2dnbGUgYSBib29s ZWFuLXR5cGUgaGVhZGVyIGluIHRoZSBjdXJyZW50IGJ1ZmZlci4KK0lmIHRoZSB2YWx1ZSBv ZiBOQU1FIGlzIFZBTFVFLCByZW1vdmUgaXQuICBPdGhlcndpc2UsIGFkZCBpdCBpZgoraXQn cyBub3QgcHJlc2VudCBhbmQgc2V0IGl0IHRvIFZBTFVFLiAgQWZ0ZXJ3YXJkLCBpZiB0aGVy ZSBhcmUgaGVhZGVycywKK21ha2Ugc3VyZSB0aGVyZSBpcyBhbiBlbXB0eSBsaW5lIGFmdGVy IHRoZW0uICBJZiB0aGVyZSBhcmUgbm8gaGVhZGVycywKK3JlbW92ZSBhbGwgZW1wdHkgbGlu ZXMgYXQgdGhlIGJlZ2lubmluZyBvZiB0aGUgYnVmZmVyLgorUmV0dXJuIHQgaWYgdG9nZ2xl ZCBvbiwgb3RoZXJ3aXNlIG5pbC4iCisgIChsZXQgKChzdGFydCAocG9pbnQpKQorICAgICAg ICAodmFsIHQpCisgICAgICAgIChsaW5lIChjb25jYXQgbmFtZSAiOiAiIHZhbHVlICJcbiIp KSkKKyAgICAoc2F2ZS1yZXN0cmljdGlvbgorICAgICAgKHJmYzgyMi1nb3RvLWVvaCkKKyAg ICAgIChuYXJyb3ctdG8tcmVnaW9uIChwb2ludC1taW4pIChwb2ludCkpCisgICAgICAoZ290 by1jaGFyIChwb2ludC1taW4pKQorICAgICAgKGlmIChyZS1zZWFyY2gtZm9yd2FyZCAoY29u Y2F0ICJeIiBuYW1lICI6IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxvZy1lZGl0LWhlYWRlci1jb250ZW50cy1yZWdleHApCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5pbCB0KQorICAgICAgICAgIChpZiAoc2V0cSB2YWwgKG5vdCAoc3RyaW5n PSAobWF0Y2gtc3RyaW5nIDEpIHZhbHVlKSkpCisgICAgICAgICAgICAgIChyZXBsYWNlLW1h dGNoIGxpbmUgdCB0KQorICAgICAgICAgICAgKHJlcGxhY2UtbWF0Y2ggIiIgdCB0KSkKKyAg ICAgICAgKGluc2VydCBsaW5lKSkpCisgICAgKHJmYzgyMi1nb3RvLWVvaCkKKyAgICAoaWYg KGJvYnApCisgICAgICAgICh3aGVuIChsb29raW5nLWF0ICJcXChbIFx0XSpcblxcKSsiKQor ICAgICAgICAgIChkZWxldGUtcmVnaW9uIChtYXRjaC1iZWdpbm5pbmcgMCkgKG1hdGNoLWVu ZCAwKSkpCisgICAgICAoZGVsZXRlLWhvcml6b250YWwtc3BhY2UpCisgICAgICAodW5sZXNz IChsb29raW5nLWF0ICJcbiIpCisgICAgICAgIChpbnNlcnQgIlxuIikpKQorICAgICh3aGVu ICg+IHN0YXJ0IChwb2ludCkpCisgICAgICAoZ290by1jaGFyIHN0YXJ0KSkKKyAgICB2YWwp KQorCiAoZGVmdW4gbG9nLWVkaXQtZXh0cmFjdC1oZWFkZXJzIChoZWFkZXJzIGNvbW1lbnQp CiAgICJFeHRyYWN0IGhlYWRlcnMgZnJvbSBDT01NRU5UIHRvIGZvcm0gY29tbWFuZCBsaW5l IGFyZ3VtZW50cy4KIEhFQURFUlMgc2hvdWxkIGJlIGFuIGFsaXN0IHdpdGggZWxlbWVudHMg b2YgdGhlIGZvcm0gKEhFQURFUiAuIENNREFSRykKLWFzc29jaWF0aW5nIGhlYWRlciBuYW1l cyB0byB0aGUgY29ycmVzcG9uZGluZyBjbWRsaW5lIG9wdGlvbiBuYW1lIGFuZCB0aGUKLXJl c3VsdCBpcyB0aGVuIGEgbGlzdCBvZiB0aGUgZm9ybSAoTVNHIENNREFSRzEgSERSVEVYVDEg Q01EQVJHMiBIRFJURVhUMi4uLikuCi13aGVyZSBNU0cgaXMgdGhlIHJlbWFpbmluZyB0ZXh0 IGZyb20gU1RSSU5HLgorb3IgKEhFQURFUiBDTURBUkcgVkFMVUUpIGFzc29jaWF0aW5nIGhl YWRlciBuYW1lcyB0byB0aGUgY29ycmVzcG9uZGluZworY21kbGluZW9wdGlvbiBuYW1lIGFu ZCB0aGUgcmVzdWx0IGlzIHRoZW4gYSBsaXN0IG9mIHRoZSBmb3JtCitcKE1TRyBDTURBUkcx IEhEUlRFWFQxIENNREFSRzIgSERSVEVYVDIuLi5cKSB3aGVyZSBNU0cgaXMgdGhlIHJlbWFp bmluZyB0ZXh0Citmcm9tIFNUUklORy4gIEZvciBIRUFERVJTIGVsZW1lbnRzIG9mIHRoZSBz ZWNvbmQgdHlwZSwgdGhlIGhlYWRlciB2YWx1ZSBpcyBub3QKK2FkZGVkIHRvIHRoZSBsaXN0 LiAgQW5kIENNREFSRyBpcyBhZGRlZCB0byB0aGUgcmVzdWx0IGxpc3Qgb25seSBpZgordGhl IGhlYWRlciB2YWx1ZSBpcyB0aGUgc2FtZSBhcyBWQUxVRS4KIElmIFwiU3VtbWFyeVwiIGlz IG5vdCBpbiBIRUFERVJTLCB0aGVuIHRoZSBcIlN1bW1hcnlcIiBoZWFkZXIgaXMgZXh0cmFj dGVkCiBhbnl3YXkgYW5kIHB1dCBiYWNrIGFzIHRoZSBmaXJzdCBsaW5lIG9mIE1TRy4iCiAg ICh3aXRoLXRlbXAtYnVmZmVyCkBAIC05MzEsOCArOTY3LDExIEBACiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbmlsIHQpCiAgICAgICAgICAgKGlmIChlcSB0IChjZHIg aGVhZGVyKSkKICAgICAgICAgICAgICAgKHNldHEgc3VtbWFyeSAobWF0Y2gtc3RyaW5nIDEp KQotICAgICAgICAgICAgKHB1c2ggKG1hdGNoLXN0cmluZyAxKSByZXMpCi0gICAgICAgICAg ICAocHVzaCAob3IgKGNkciBoZWFkZXIpIChjYXIgaGVhZGVyKSkgcmVzKSkKKyAgICAgICAg ICAgIChpZiAoY29uc3AgKGNkciBoZWFkZXIpKQorICAgICAgICAgICAgICAgICh3aGVuIChz dHJpbmc9IChtYXRjaC1zdHJpbmcgMSkgKG50aCAyIGhlYWRlcikpCisgICAgICAgICAgICAg ICAgICAocHVzaCAobnRoIDEgaGVhZGVyKSByZXMpKQorICAgICAgICAgICAgICAocHVzaCAo bWF0Y2gtc3RyaW5nIDEpIHJlcykKKyAgICAgICAgICAgICAgKHB1c2ggKG9yIChjZHIgaGVh ZGVyKSAoY2FyIGhlYWRlcikpIHJlcykpKQogICAgICAgICAgIChyZXBsYWNlLW1hdGNoICIi IHQgdCkpKQogICAgICAgOzsgUmVtb3ZlIGhlYWRlciBzZXBhcmF0b3IgaWYgdGhlIGhlYWRl ciBpcyBlbXB0eS4KICAgICAgICh3aWRlbikKCj09PSBtb2RpZmllZCBmaWxlICdsaXNwL3Zj L3ZjLWdpdC5lbCcKLS0tIGxpc3AvdmMvdmMtZ2l0LmVsCTIwMTItMDktMTcgMDU6NDE6MDQg KzAwMDAKKysrIGxpc3AvdmMvdmMtZ2l0LmVsCTIwMTItMDktMjggMjM6NDQ6MzkgKzAwMDAK QEAgLTYwOCwxNCArNjA4LDM5IEBACiAoZGVmdW4gdmMtZ2l0LXVucmVnaXN0ZXIgKGZpbGUp CiAgICh2Yy1naXQtY29tbWFuZCBuaWwgMCBmaWxlICJybSIgIi1mIiAiLS1jYWNoZWQiICIt LSIpKQogCi0oZGVjbGFyZS1mdW5jdGlvbiBsb2ctZWRpdC1leHRyYWN0LWhlYWRlcnMgImxv Zy1lZGl0IiAoaGVhZGVycyBzdHJpbmcpKQorKGRlZnVuIHZjLWdpdC1sb2ctZWRpdC10b2dn bGUtc2lnbm9mZiAoKQorICAoaW50ZXJhY3RpdmUpCisgIChsb2ctZWRpdC10b2dnbGUtaGVh ZGVyICJTaWduLU9mZiIgInllcyIpKQorCisoZGVmdW4gdmMtZ2l0LWxvZy1lZGl0LXRvZ2ds ZS1hbWVuZCAoKQorICAoaW50ZXJhY3RpdmUpCisgICh3aGVuIChsb2ctZWRpdC10b2dnbGUt aGVhZGVyICJBbWVuZCIgInllcyIpCisgICAgKGdvdG8tY2hhciAocG9pbnQtbWF4KSkKKyAg ICAodW5sZXNzIChib2xwKSAoaW5zZXJ0ICJcbiIpKQorICAgIChpbnNlcnQgKHdpdGgtb3V0 cHV0LXRvLXN0cmluZworICAgICAgICAgICAgICAodmMtZ2l0LWNvbW1hbmQKKyAgICAgICAg ICAgICAgIHN0YW5kYXJkLW91dHB1dCAxIG5pbAorICAgICAgICAgICAgICAgImxvZyIgIi0t bWF4LWNvdW50PTEiICItLXByZXR0eT1mb3JtYXQ6JUIiICJIRUFEIikpKSkpCisKKyhkZWZ2 YXIgdmMtZ2l0LWxvZy1lZGl0LW1vZGUtbWFwCisgIChsZXQgKChtYXAgKG1ha2Utc3BhcnNl LWtleW1hcCAiR2l0LUxvZy1FZGl0IikpKQorICAgIChkZWZpbmUta2V5IG1hcCAiXEMtY1xD LXMiICd2Yy1naXQtbG9nLWVkaXQtdG9nZ2xlLXNpZ25vZmYpCisgICAgKGRlZmluZS1rZXkg bWFwICJcQy1jXEMtZSIgJ3ZjLWdpdC1sb2ctZWRpdC10b2dnbGUtYW1lbmQpCisgICAgbWFw KSkKKworKGRlZmluZS1kZXJpdmVkLW1vZGUgdmMtZ2l0LWxvZy1lZGl0LW1vZGUgbG9nLWVk aXQtbW9kZSAiKlZDLWxvZyoiCisgICJNYWpvciBtb2RlIGZvciBlZGl0aW5nIEdpdCBsb2cg bWVzc2FnZXMuCitJdCBpcyBiYXNlZCBvbiBgbG9nLWVkaXQtbW9kZScsIGFuZCBoYXMgR2l0 LXNwZWNpZmljIGV4dGVuc2lvbnMuCitcXHt2Yy1naXQtbG9nLWVkaXQtbW9kZS1tYXB9IikK IAogKGRlZnVuIHZjLWdpdC1jaGVja2luIChmaWxlcyBfcmV2IGNvbW1lbnQpCiAgIChsZXQg KChjb2Rpbmctc3lzdGVtLWZvci13cml0ZSB2Yy1naXQtY29tbWl0cy1jb2Rpbmctc3lzdGVt KSkKICAgICAoYXBwbHkgJ3ZjLWdpdC1jb21tYW5kIG5pbCAwIGZpbGVzCiAJICAgKG5jb25j IChsaXN0ICJjb21taXQiICItbSIpCiAgICAgICAgICAgICAgICAgICAobG9nLWVkaXQtZXh0 cmFjdC1oZWFkZXJzICcoKCJBdXRob3IiIC4gIi0tYXV0aG9yIikKLQkJCQkJICAgICAgKCJE YXRlIiAuICItLWRhdGUiKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAoIkRhdGUiIC4gIi0tZGF0ZSIpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKCJBbWVuZCIgIi0tYW1lbmQiICJ5ZXMiKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgiU2lnbi1PZmYi ICItLXNpZ25vZmYiICJ5ZXMiKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29tbWVudCkKICAgICAgICAgICAgICAgICAgIChsaXN0ICItLW9ubHki ICItLSIpKSkpKQogCgo= --------------090604080805030603090605-- From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 30 23:16:38 2012 Received: (at 12537) by debbugs.gnu.org; 1 Oct 2012 03:16:38 +0000 Received: from localhost ([127.0.0.1]:35295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TIWUn-0007pY-OE for submit@debbugs.gnu.org; Sun, 30 Sep 2012 23:16:38 -0400 Received: from ironport2-out.teksavvy.com ([206.248.154.182]:10890) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TIWUm-0007pR-Nc for 12537@debbugs.gnu.org; Sun, 30 Sep 2012 23:16:37 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAG6Zu09FxLT4/2dsb2JhbABEtBGBCIIWAQVWIxALDiYSFBgNJIghugmQRAOjM4FYgwU X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="200341451" Received: from 69-196-180-248.dsl.teksavvy.com (HELO pastel.home) ([69.196.180.248]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 30 Sep 2012 23:16:11 -0400 Received: by pastel.home (Postfix, from userid 20848) id C2DF7594CA; Sun, 30 Sep 2012 23:16:05 -0400 (EDT) From: Stefan Monnier To: Dmitry Gutov Subject: Re: bug#12537: Acknowledgement (support for git commit --amend/--signoff) Message-ID: References: <50663CC0.6000803@yandex.ru> <50663D58.4010702@yandex.ru> Date: Sun, 30 Sep 2012 23:16:05 -0400 In-Reply-To: <50663D58.4010702@yandex.ru> (Dmitry Gutov's message of "Sat, 29 Sep 2012 04:14:16 +0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 12537 Cc: 12537@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: 0.3 (/) > - (,(concat "^\\(\\([[:alpha:]]+\\):\\)" log-edit-header-contents-regexp) > + (,(concat "^\\(\\([[:alpha:]][^: \n\t]+\\):\\)" > + log-edit-header-contents-regexp) I'd prefer to only add hyphens, as in [[:alpha:]-]. > +(defun log-edit-toggle-header (name value) > + "Toggle a boolean-type header in the current buffer. > +If the value of NAME is VALUE, remove it. Otherwise, add it if > +it's not present and set it to VALUE. Afterward, if there are headers, > +make sure there is an empty line after them. If there are no headers, > +remove all empty lines at the beginning of the buffer. > +Return t if toggled on, otherwise nil." How 'bout leaving the header, just with an empty content, so you never have to deal with "remove a sole empty line if there's no header left"? > +or (HEADER CMDARG VALUE) associating header names to the corresponding > +cmdlineoption name and the result is then a list of the form > +\(MSG CMDARG1 HDRTEXT1 CMDARG2 HDRTEXT2...\) where MSG is the remaining text > +from STRING. For HEADERS elements of the second type, the header value is > +not added to the list. And CMDARG is added to the result list only if > +the header value is the same as VALUE. I think I'd rather provide something a bit more general. E.g. accept entries of the form (HEADER . FUNCTION) where function takes the header's value and returns a list of arguments where vc-git can provide as FUNCTION something like (lambda (val) (if (equal val "yes") '("--amend"))) > +(defun vc-git-log-edit-toggle-signoff () > + (interactive) > + (log-edit-toggle-header "Sign-Off" "yes")) please provide a docstring for interactive functions. > +(defun vc-git-log-edit-toggle-amend () > + (interactive) Same here. > +(define-derived-mode vc-git-log-edit-mode log-edit-mode "*VC-log*" "*VC-log*"? Really? Shouldn't that be "Log-Edit" or "Log-Edit/git" or something? > + "Major mode for editing Git log messages. > +It is based on `log-edit-mode', and has Git-specific extensions. > +\\{vc-git-log-edit-mode-map}") The \\{vc-git-log-edit-mode-map} shouldn't be needed since define-derived-mode will add it for you anyway. Other than that, it looks OK, so feel free to install it after you fixed the above details. Stefan From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 30 23:59:46 2012 Received: (at 12537) by debbugs.gnu.org; 1 Oct 2012 03:59:46 +0000 Received: from localhost ([127.0.0.1]:35345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TIXAY-0001J1-0d for submit@debbugs.gnu.org; Sun, 30 Sep 2012 23:59:46 -0400 Received: from forward13.mail.yandex.net ([95.108.130.120]:43799) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TIXAS-0001Iq-P7 for 12537@debbugs.gnu.org; Sun, 30 Sep 2012 23:59:44 -0400 Received: from smtp13.mail.yandex.net (smtp13.mail.yandex.net [95.108.130.68]) by forward13.mail.yandex.net (Yandex) with ESMTP id 69CEB1421EB; Mon, 1 Oct 2012 07:59:14 +0400 (MSK) Received: from smtp13.mail.yandex.net (localhost [127.0.0.1]) by smtp13.mail.yandex.net (Yandex) with ESMTP id 3A614E4057D; Mon, 1 Oct 2012 07:59:14 +0400 (MSK) Received: from 5x166x253x130.dynamic.spb.ertelecom.ru (5x166x253x130.dynamic.spb.ertelecom.ru [5.166.253.130]) by smtp13.mail.yandex.net (nwsmtp/Yandex) with ESMTP id xDmCHGjj-xDm0J6UN; Mon, 1 Oct 2012 07:59:14 +0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1349063954; bh=ISknc8NMrj9q00qj3s2dvtO/AHUPb19otO1My4uFg7U=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=M/KAK2AeTx+RK2NHBkpI7fLz7xY293tSOJ7mmRMTlAP03nWVANfdCey8n/QjffShv KuN2FN3ZxV3otKsZqmBiBVuwanHDJHt0+3HWv4w+o9wjC5z7bTG3Lozb/1i3Tafo7h Br0iYAWPpx+JFrlHiY78Y364U3iJXoH5YbJVQEa4= Message-ID: <50691513.6090704@yandex.ru> Date: Mon, 01 Oct 2012 07:59:15 +0400 From: Dmitry Gutov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: Stefan Monnier Subject: Re: bug#12537: Acknowledgement (support for git commit --amend/--signoff) References: <50663CC0.6000803@yandex.ru> <50663D58.4010702@yandex.ru> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 12537 Cc: 12537@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -0.7 (/) On 01.10.2012 7:16, Stefan Monnier wrote: >> - (,(concat "^\\(\\([[:alpha:]]+\\):\\)" log-edit-header-contents-regexp) >> + (,(concat "^\\(\\([[:alpha:]][^: \n\t]+\\):\\)" >> + log-edit-header-contents-regexp) > > I'd prefer to only add hyphens, as in [[:alpha:]-]. Ok. How about I also add the limitation that the first character must be a capital letter? message-font-lock-keywords has that. >> +(defun log-edit-toggle-header (name value) >> + "Toggle a boolean-type header in the current buffer. >> +If the value of NAME is VALUE, remove it. Otherwise, add it if >> +it's not present and set it to VALUE. Afterward, if there are headers, >> +make sure there is an empty line after them. If there are no headers, >> +remove all empty lines at the beginning of the buffer. >> +Return t if toggled on, otherwise nil." > > How 'bout leaving the header, just with an empty content, so you never > have to deal with "remove a sole empty line if there's no header left"? Works for me. >> +or (HEADER CMDARG VALUE) associating header names to the corresponding >> +cmdlineoption name and the result is then a list of the form >> +\(MSG CMDARG1 HDRTEXT1 CMDARG2 HDRTEXT2...\) where MSG is the remaining text >> +from STRING. For HEADERS elements of the second type, the header value is >> +not added to the list. And CMDARG is added to the result list only if >> +the header value is the same as VALUE. > > I think I'd rather provide something a bit more general. E.g. accept > entries of the form (HEADER . FUNCTION) where function takes the > header's value and returns a list of arguments where vc-git can provide > as FUNCTION something like > (lambda (val) (if (equal val "yes") '("--amend"))) Okay. That's definitely less awkward than my proposed change. >> +(defun vc-git-log-edit-toggle-signoff () >> + (interactive) >> + (log-edit-toggle-header "Sign-Off" "yes")) > > please provide a docstring for interactive functions. > >> +(defun vc-git-log-edit-toggle-amend () >> + (interactive) > > Same here. > >> +(define-derived-mode vc-git-log-edit-mode log-edit-mode "*VC-log*" > > "*VC-log*"? Really? Shouldn't that be "Log-Edit" or "Log-Edit/git" > or something? Sure, will do. I like the "Log-Edit/git" option better. >> + "Major mode for editing Git log messages. >> +It is based on `log-edit-mode', and has Git-specific extensions. >> +\\{vc-git-log-edit-mode-map}") > > The \\{vc-git-log-edit-mode-map} shouldn't be needed since > define-derived-mode will add it for you anyway. > > Other than that, it looks OK, so feel free to install it after you fixed > the above details. I think we're entering the feature freeze period right about now. Is it okay if I install the updated patch 16 hours or so later? From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 01 00:32:43 2012 Received: (at 12537) by debbugs.gnu.org; 1 Oct 2012 04:32:43 +0000 Received: from localhost ([127.0.0.1]:35419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TIXgR-00025Z-7v for submit@debbugs.gnu.org; Mon, 01 Oct 2012 00:32:43 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:53775) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TIXgP-00025T-Q8 for 12537@debbugs.gnu.org; Mon, 01 Oct 2012 00:32:42 -0400 Received: by padfb11 with SMTP id fb11so3951856pad.3 for <12537@debbugs.gnu.org>; Sun, 30 Sep 2012 21:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=coUp6pP2FlGTbjV+SURGXT707PlQXnXTer21HVU3X/w=; b=CFnPAe/zH7OA8QFC4uG0UhY9RccIAZrFytWZJ+cV8OPWNtJ4K4bsfJQEHL9qOum99+ gtrZ5B+q6eU8Cz/SrbuK/DgNXqrk4JTkTq44F1o0ZZXKUvSsu56gV7Xtd0lS/RUM25Ko Iw7FQQGVr+L5/rYJ701igbhWyiqyrZPPbG//loVKSMGPm75mFdAzX/jD1Y32ruT4pR0I DrTQFeeo8Gskh5kMCTbraJFL3Q9gcOIeLsd+KWaSY9KP+dfe79dVdzl63MopdVQg2l3Z LGRxzPScob7TdoIvUdEs79gLXA6ppyXCbTIkJeFEbqQl9AUtNX607eQ25cCgtQDjjwkr MaNg== Received: by 10.68.135.168 with SMTP id pt8mr1313541pbb.24.1349065936415; Sun, 30 Sep 2012 21:32:16 -0700 (PDT) Received: from ulysses ([155.69.18.66]) by mx.google.com with ESMTPS id qd9sm9646552pbb.31.2012.09.30.21.32.12 (version=SSLv3 cipher=OTHER); Sun, 30 Sep 2012 21:32:15 -0700 (PDT) From: Chong Yidong To: Dmitry Gutov Subject: Re: bug#12537: Acknowledgement (support for git commit --amend/--signoff) References: <50663CC0.6000803@yandex.ru> <50663D58.4010702@yandex.ru> <50691513.6090704@yandex.ru> Date: Mon, 01 Oct 2012 12:32:10 +0800 In-Reply-To: <50691513.6090704@yandex.ru> (Dmitry Gutov's message of "Mon, 01 Oct 2012 07:59:15 +0400") Message-ID: <87txueolrp.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 12537 Cc: 12537@debbugs.gnu.org, Stefan Monnier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -0.7 (/) Dmitry Gutov writes: > I think we're entering the feature freeze period right about now. Is > it okay if I install the updated patch 16 hours or so later? No problem. From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 01 20:29:15 2012 Received: (at 12537-done) by debbugs.gnu.org; 2 Oct 2012 00:29:15 +0000 Received: from localhost ([127.0.0.1]:36878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TIqMM-0000gp-Bz for submit@debbugs.gnu.org; Mon, 01 Oct 2012 20:29:15 -0400 Received: from forward1.mail.yandex.net ([77.88.46.6]:35000) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TIqMH-0000gf-DD for 12537-done@debbugs.gnu.org; Mon, 01 Oct 2012 20:29:12 -0400 Received: from smtp1.mail.yandex.net (smtp1.mail.yandex.net [77.88.46.101]) by forward1.mail.yandex.net (Yandex) with ESMTP id 44E5D1241081; Tue, 2 Oct 2012 04:28:38 +0400 (MSK) Received: from smtp1.mail.yandex.net (localhost [127.0.0.1]) by smtp1.mail.yandex.net (Yandex) with ESMTP id 110E1AA0581; Tue, 2 Oct 2012 04:28:38 +0400 (MSK) Received: from 37x113x84x135.dynamic.spb.ertelecom.ru (37x113x84x135.dynamic.spb.ertelecom.ru [37.113.84.135]) by smtp1.mail.yandex.net (nwsmtp/Yandex) with ESMTP id SbAK9Ax2-SbAKUp82; Tue, 2 Oct 2012 04:28:37 +0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1349137718; bh=3QiMAe1yqFnVcvvkYK+O7XdyDRssOQtusHSQfvtzl7E=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Content-Transfer-Encoding; b=wShVKfGGnF6FimHwOjOPGjFtC2PpJzg6yWWe50o8L3cY2naQhic1YQhWL/6FLC2Rx M3WQ2ITymNULJij/TRaLTGqMRKNTXjmckNn+p+5yD1bEWynpLiwZ9+Ak+onQibjYT9 Qz7ZBZUUTzWskYZrx28YhtxY8ay2BW6sgJECSojg= Message-ID: <506A353C.7030702@yandex.ru> Date: Tue, 02 Oct 2012 04:28:44 +0400 From: Dmitry Gutov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: Stefan Monnier Subject: Re: bug#12537: Acknowledgement (support for git commit --amend/--signoff) References: <50663CC0.6000803@yandex.ru> <50663D58.4010702@yandex.ru> <50691513.6090704@yandex.ru> <87txueolrp.fsf@gnu.org> In-Reply-To: <87txueolrp.fsf@gnu.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: 12537-done Cc: Chong Yidong , 12537-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: 0.1 (/) Installed, closing. By the way, the separator line added in 110266 is a nice touch. --Dmitry From unknown Mon Aug 18 00:05:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 30 Oct 2012 11:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator