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 17:20:43 +0300 Message-ID: <86froofcck.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> <86msiwfesj.fsf@gnu.org> <87a5ewckza.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="2723"; 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 16:21:47 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 1t3FlZ-0000QY-0B for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 22 Oct 2024 16:21:45 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3FlV-0006SY-9l; Tue, 22 Oct 2024 10:21:41 -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 1t3FlP-0006SK-1R for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 10:21:35 -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 1t3FlO-0005s4-PE for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 10:21: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=Rcsysc3SrDST86WK3naaYe63DT74w1rkKe81YrVHHSg=; b=gJd7fWi+onb3dQTJ2EpO09C+gEMbSEEMnjBdJ+HgmZYq+2ZGn/WIAYiBLORcSYQEsidmXd+wVt2YBdUlj5yHnRhGe8UIHdVG/VBS5dOTLVT7ZNCfU4mvbJEXtVGdVKxAEltHlseILIV9dp5sJ4Nx7bTz9QtgPSim6mgd4bCQ9/YEGW2KKewYR2UDK/epL7IVD/c2vpaRyiH7TPLg0QhGTdZd6AvOlTbg9Ax4KhUfq9z23GG3Ith8eDwnyLnlmXxhbPxcAPslZsoQzwB5EX4+pB5dwXOqKxDdf6RI/vcEB8UDJK7VXzIX3XHQTxTI4NwD5ZxN1f7QTpTc8evbBHuFBg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t3Flq-000621-KN for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 10:22:02 -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 14:22:02 +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.172960688523061 (code B ref 64055); Tue, 22 Oct 2024 14:22:02 +0000 Original-Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 14:21:25 +0000 Original-Received: from localhost ([127.0.0.1]:56838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3FlE-0005zt-Uj for submit@debbugs.gnu.org; Tue, 22 Oct 2024 10:21:25 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:40732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3FlC-0005ze-29 for 64055@debbugs.gnu.org; Tue, 22 Oct 2024 10:21:23 -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 1t3Fkd-0005lk-LD; Tue, 22 Oct 2024 10:20:48 -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=Rcsysc3SrDST86WK3naaYe63DT74w1rkKe81YrVHHSg=; b=nfVVF2r/gGJ4tjTj/J22 caisDGEXeRLxIFkj8T1QKy2QFoxx3Mvttrv2EwtBuhbKLW4hd7EkGo76/8Hmip5HGFv/n0maIBdGv wi+apEK9tRm3iK6MQJR/QGtzuFLTt6bcxUVuox9u53Ggg5SiyjtWwGOyCDJn9vpxqE+uYvAwCwSru nz+ySIc27dUJerzn73BL2AhrQIOk7xz7VKX6RmV1PZGVMd5jrw0zKFhT0UkT4U0E2iIPJsMUsONGT QH/4F+cyNLumXIep598qZ980PCqRj0LIYn9vCv/0lZcTnYxgEAUNyL7M5FIq0fYhlw/54UyUps9mA XQSV1UAyva7Vwg==; In-Reply-To: <87a5ewckza.fsf@melete.silentflame.com> (message from Sean Whitton on Tue, 22 Oct 2024 21:42:33 +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:294107 Archived-At: > From: Sean Whitton > Cc: 64055@debbugs.gnu.org, dgutov@yandex.ru, Morgan.J.Smith@outlook.com > Date: Tue, 22 Oct 2024 21:42:33 +0800 > > - Manually create a temporary file somewhere outside the repository; > I'll refer to its absolute file name as TEMP. > > - Put the commit message for ORIG-REV into the temporary file. > > - Modify that commit message to include the Unicode, or whatever. > > - Prepend "amend! \n\n". So for example: > > --8<---------------cut here---------------start------------->8--- > amend! 212cf3125611b123707feac6f7ffd55a230bc568 > > Make all the entries in 'eshell-parse-argument-hook' named functions > > * lisp/eshell/esh-arg.el (eshell-parse-number, eshell-parse-non-special) > (eshell-parse-whitespace, eshell-parse-comment): New functions... > (eshell-parse-argument-hook): ... use them. אבגד ą ě č > --8<---------------cut here---------------end--------------->8--- > > - Save the temporary file. > > - Ensure there are no staged changes. > ('git reset' with no arguments should do it) > > - git commit --allow-empty -F TEMP > > - git rebase --autosquash -i ORIG-REV~1 This last step shows the following (again, indented 2 columns by me): pick bf73d7e Foobar with some Unicode אבגד ą ě č # pick d796890ee8cc77ac899954c3e94e5257c5f72615 amend! bf73d7e036c5d80cdd112f34255a0ab1ea697c07 # Rebase 6c6ea73..d796890 onto 6c6ea73 (1 command) # # Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message # x, exec = run command (the rest of the line) using shell # d, drop = remove commit # # These lines can be re-ordered; they are executed from top to bottom. # # If you remove a line here THAT COMMIT WILL BE LOST. # # However, if you remove everything, the rebase will be aborted. # # Note that empty commits are commented out And if I type "C-x #" to exit, without changing the above in any way (since you didn't tell me to change anything), I'm back at ORIG-REV with its original log message. IOW, the editing of the commit log message failed.