From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton Newsgroups: gmane.emacs.bugs Subject: bug#64055: Implementation of modifying VC change comments for Git Date: Mon, 21 Oct 2024 09:52:02 +0800 Message-ID: <87wmi2kyt9.fsf@melete.silentflame.com> References: <874j59wym3.fsf@melete.silentflame.com> <868qukl73k.fsf@gnu.org> <87bjzfuzaq.fsf@melete.silentflame.com> <867ca3jhsd.fsf@gnu.org> <871q0brvyj.fsf@melete.silentflame.com> <8634krjfmo.fsf@gnu.org> <87bjzfqg7d.fsf@melete.silentflame.com> <878qujp0mq.fsf@melete.silentflame.com> <86y12jhva6.fsf@gnu.org> <87o73eor6j.fsf@melete.silentflame.com> <86r08aj2yz.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="25249"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Morgan.J.Smith@outlook.com, 64055@debbugs.gnu.org, dgutov@yandex.ru To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Oct 21 03:52:49 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1t2hbD-0006PQ-O8 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 21 Oct 2024 03:52:48 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2hb4-0002sS-C6; Sun, 20 Oct 2024 21:52:38 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t2hb2-0002sI-MO for bug-gnu-emacs@gnu.org; Sun, 20 Oct 2024 21:52:36 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t2hb2-00006J-EB for bug-gnu-emacs@gnu.org; Sun, 20 Oct 2024 21:52:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=TxJy1dRj7jhyuUmJMCq+r1emrgfPCOIi49ipkPcMsY8=; b=HcPV3soFvyLdsc5mADLGG0qRcITkyi3Xb+zNy5kLnQxNdf8qfTZ1oa0M3L5Ga7hj0rk0YmbAH88oBcbYjKsFAmVGI9UGhuSN7YNUh8vvMJy53jcdALuBpO4tI/h8kjUPEpZmEbxGCWv3aV3/guvfheO77fXoOS5tS9gsf9lAjNJEZ9HTKp4BFU375Xw4w/v1JflfBmXgJ8weLy3lq4NKqsHiAiTYIspk7IiVA3lu6jx+2G6+ExD2JAV+xZnnJooCSvBtG/trU8ybA6GweMkrtMbjPHiCppfDUqAy1fXl7bGnJRaOIQ0jwuPEMEv2m2OvdCIjObJvBYAoNZM4LIE4qg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t2hbS-0002mI-08 for bug-gnu-emacs@gnu.org; Sun, 20 Oct 2024 21:53:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 21 Oct 2024 01:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64055 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64055-submit@debbugs.gnu.org id=B64055.172947556210644 (code B ref 64055); Mon, 21 Oct 2024 01:53:01 +0000 Original-Received: (at 64055) by debbugs.gnu.org; 21 Oct 2024 01:52:42 +0000 Original-Received: from localhost ([127.0.0.1]:49470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t2hb7-0002lc-Is for submit@debbugs.gnu.org; Sun, 20 Oct 2024 21:52:41 -0400 Original-Received: from sendmail.purelymail.com ([34.202.193.197]:35422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t2hb5-0002lO-JQ for 64055@debbugs.gnu.org; Sun, 20 Oct 2024 21:52:40 -0400 DKIM-Signature: a=rsa-sha256; b=S8uKtMwebiXDjJAgnJDXnp1rFBdAfjaIQj7JSzgOnxV1EeYLSJi5Zk4EMK9BQbPqV2mP7vkMtdnqrggRTGKBSqwQOohhPJ9M8MhbXJ+bGhm1lcIHw9G8t86rDJHcXEQVCOHn2V5QH8cfhi+VlqokgvN4fANrOA1wrAfwmOZoqMP/mrl7TaoIcvb4enw8MntC/V9bPcFthDxoAuYE7n4XdmvDB5MNdtGSsdhITnBVFWrQBIYCXhRCz28iJwQnGadzhyfBFmpoQEny72MML55JLTlOzHOd23QD6xs69HUjju7dIcgcrDBqgbiyU1qkFgjjL0hJcGXliflfAat9SIcXhA==; s=purelymail1; d=spwhitton.name; v=1; bh=et/lEUe5m5tt2+u/qXYM/xjBsKdlYfaOP/NvbUEH9rQ=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=AqaeB1vBX7IX9bx/R1qycWr3DRegS0/AkzE5B2Lw4mEA8L0fYjzzFtBAwt6++y4im2MyrwPa8Ry2V0stDaPFlSqj2lWivJb/k/rFKu3glW0Su2AeGttAIxMTrtyKaDG4m+oOw2RLiRogVHpEJCylcHK/eFZD1/OWio5aAZc5M1DvgP53B97fW2Gii/oXSn8+12YzUPYCcyVEWmfumvtUI9CqxfzyKPrjEwEc6LGEceM365UExOF0GyYpw7nIamBQfdWOxGqrADXC7MeZIDvyoRKXb5wYDyOWAq89VyDtDxBJPBeBc/x7O1qy17HRN9gvYwoGjD+vYixFFJIfDdryww==; s=purelymail1; d=purelymail.com; v=1; bh=et/lEUe5m5tt2+u/qXYM/xjBsKdlYfaOP/NvbUEH9rQ=; h=Feedback-ID:Received:Received:From:To:Subject:Date; Feedback-ID: 20115:3760:null:purelymail X-Pm-Original-To: 64055@debbugs.gnu.org Original-Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1993594376; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Mon, 21 Oct 2024 01:52:06 +0000 (UTC) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id 3C8C17EB6AA; Mon, 21 Oct 2024 09:52:02 +0800 (CST) In-Reply-To: <86r08aj2yz.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 20 Oct 2024 16:52:52 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:294015 Archived-At: Hello, On Sun 20 Oct 2024 at 04:52pm +03, Eli Zaretskii wrote: >> From: Sean Whitton >> Cc: 64055@debbugs.gnu.org, dgutov@yandex.ru, Morgan.J.Smith@outlook.com >> Date: Sun, 20 Oct 2024 21:11:00 +0800 >> >> >> Oh, wait, it wouldn't. Does it appear in 'C-x v L'? >> > >> > Yes. >> >> Okay. Does the message look like this: >> >> amend! >> >> > > Yes. > >> If so, then we know that the invocation of 'git commit' is working, and >> the problem is somewhere else -- probably the invocation of 'git rebase'. > > With you, so far. I think the next thing to do is try the rebase from the command line. So, please use the debugging version of my patch to create the special "amend!" commit again, or use the one from yesterday if you still have it, or you could manually create it by passing --allow-empty to 'git commit'. Then, at the command line, use git rebase --autosquash -i REV~1 where REV is the sha1 of the commit whose message you intend to edit. This should open an editor with a rebase plan in which you see - the commit whose message you wanted to change - followed by the special amend! commit - followed by any other commits following the one whose message you wanted to change i.e. the amend! commit has been pulled down in history to just after the commit whose message you want to cahnge. Just save and exit without making any changes to the plan. After that, the whole process should be complete: you should have the same commits as previously except the message should have been updated, and sha1 hashes will have changed. Let me know if this all works. -- Sean Whitton