From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#64055: Implementation of modifying VC change comments for Git Date: Tue, 22 Oct 2024 16:27:56 +0300 Message-ID: <86msiwfesj.fsf@gnu.org> 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> <87wmi2kyt9.fsf@melete.silentflame.com> <86a5exh8ib.fsf@gnu.org> <87y12gfsrz.fsf@melete.silentflame.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="14481"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Morgan.J.Smith@outlook.com, 64055@debbugs.gnu.org, dgutov@yandex.ru To: Sean Whitton Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Oct 22 15:28:58 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 1t3EwR-0003cV-Jd for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 22 Oct 2024 15:28:55 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3Ew7-0004K4-9v; Tue, 22 Oct 2024 09:28:35 -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 1t3Ew6-0004Jp-Gf for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 09:28:34 -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 1t3Ew6-0007PS-7e for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 09:28:34 -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:References:In-Reply-To:From:Date:To:Subject; bh=gzzMNB8Gr/kinF8qO55QNVdzrCiR2wzgWIBc/2adYkU=; b=gKASWsucqC880/Q9v5CFcML+0Im1eEYu+c6Cx9ntOUWu/OU6P5njnqQE0t+/7yp6huV6qVcb7lKZr2u/dBs62xNZY6iP+zUmt0o+UtI/2OJB7Juaj6BkuA5lAzPzIb2vbxI31Ux5AYy4jVA0XdOrZInXYlX82JiwqvKEhsxEtta7F2ZcAZHc7gXclocqSx+jWMIm7d8wad9HwwsBWeibmGihR9ueTJumEFBFaQG+wIhd1Tslh4wPdiy4UuJTwt5oPxE4Pgm6olffhvpNr7lTkd3z4p9P7K/YZQ2nOoLL2PQ5inw5hBlpcK6+eknh25wxY6rMKr55UwmYMEQDdoxL4g==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t3EwX-00032p-MB for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 09:29:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 22 Oct 2024 13:29: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.172960373111677 (code B ref 64055); Tue, 22 Oct 2024 13:29:01 +0000 Original-Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 13:28:51 +0000 Original-Received: from localhost ([127.0.0.1]:55076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3EwN-00032G-4k for submit@debbugs.gnu.org; Tue, 22 Oct 2024 09:28:51 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:59882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3EwJ-00031z-GU for 64055@debbugs.gnu.org; Tue, 22 Oct 2024 09:28:50 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3Evl-0007Nm-OU; Tue, 22 Oct 2024 09:28:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=gzzMNB8Gr/kinF8qO55QNVdzrCiR2wzgWIBc/2adYkU=; b=h02jq3DSphCMmnIVZHYq eTh2L2KpmJAfPQaSUJ0zaPD/34ozeQHS5NyXo5c1p1pPgwm9rfhTbGfpGxDJ3oejZOuyMKPTfttC9 nnk10op2PES22P3cXv7EsK7SMJwfZ7QsZCSJvcC2PKjA8f80e32L68BkUGxedOkr//gpAPLYdZC8d /CFj5NZZor0gm23cv8nVzvyx7zPyWP62EdyAwIDWKqntOzLO/Y9OIKjdAxNfH/8FQo/IMsa+tWZQT PnNhn9crnOo4UxTjJ/vUcqM6Y8H0EUqyKAPHi7y4zdFoEQ/Rpn8mboEsq4rHLzwMI5pU5FHCI2TqC 8ubTwUwQyVOpfg==; In-Reply-To: <87y12gfsrz.fsf@melete.silentflame.com> (message from Sean Whitton on Tue, 22 Oct 2024 16:25:52 +0800) 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:294102 Archived-At: > From: Sean Whitton > Cc: 64055@debbugs.gnu.org, dgutov@yandex.ru, Morgan.J.Smith@outlook.com > Date: Tue, 22 Oct 2024 16:25:52 +0800 > > > At this point "git log" shows a revision with my amended log message > > (let's call this AMENDED-REV), followed by the revision with the > > original log message (let's call it ORIG-REV). So my Git command > > looks like this: > > > > git rebase --autosquash -i ORIG-REV~1 > > > > After this step, I see this in the editor (where I indented the text > > by 2 columns): > > > > pick bf73d7e Foobar with some Unicode אבגד ą ě č > > # pick bc3c567b2b136d040fd13373b6594c1ec026fec6 Foobar with some Unicode אבגד ą ě č > > There are two things about this output that are unexpected to me: > > - The first line of the AMENDED-REV message does not appear to start > with "amend!". I thought that you confirmed in a previous message > that the commit messsage of AMENDED-REV did have this structure: > > amend! > > It isn't there because you didn't tell me to include it. The original commit was lost when I tried to perform the steps the previous time, so I had to reproduce it, and I used the last part of this step to produce it: > 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'. IOW, I "manually created it by passing --allow-empty to 'git commit'", but since you didn't say what log message to give, I used just some random text, and it didn't include "amend!". If the log message I use in this step must have some specific structure or content, please give more detailed instructions. > - The line for the AMENDED-REV message is commented out. That means > that git-rebase proposes to drop the commit. I would guess that git > wants to drop it because it introduces no content changes. > > > Does this mean it didn't work? or did I misinterpret the steps? > > I think that there are two possibilities. If you lost the magic > "amend!" commit then please try again with an AMENDED-REV whose commit > message has the special "amend!" structure. I will, once you give the detailed instructions for how to do it from the shell prompt. > You can create one manually by passing --allow-empty to git-commit, or > you can use the previous version of my patch with everything except the > call to git-commit commented out -- here's the diff doing the > commenting-out again, if you need it. The diff no longer applies to the current master. And I prefer doing that manually anyway. So let's have those instructions in full detail. Thanks.