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: Tue, 22 Oct 2024 21:42:33 +0800 Message-ID: <87a5ewckza.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> <87wmi2kyt9.fsf@melete.silentflame.com> <86a5exh8ib.fsf@gnu.org> <87y12gfsrz.fsf@melete.silentflame.com> <86msiwfesj.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37927"; 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 Tue Oct 22 15:44:16 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 1t3FBF-0009hV-3d for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 22 Oct 2024 15:44:13 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3FAm-0000Of-Cm; Tue, 22 Oct 2024 09:43:44 -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 1t3FAe-0000Fv-UW for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 09:43:38 -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 1t3FAd-00019t-3B for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 09:43: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=hQmzu8FKp1cHvZAJZPKrGMt+/rO/+BSNoIEbGZaRvwI=; b=frBG3X1KhEG16KQhjVG5gKalQ0CTdkkSVyOvhXJdACZGRuVpfFKu3wwQGsmvwcvnJLHraIIxlvLA6uDCFP8qCbN3rd4ExJIgL7zApUb7skNsxQIBcjUznAdYn3iZL+YwbD+c7S9KrL6mKDHzmN1CYrz8/VBKdkI4WW+8NSUaRVphDAVBIjTwqV92SVv7GcLm8sR+jKH3qsvUbC1bNKb1oNej7Yd3VLm6M1j/pav2wsxH7dcehxTYv8D8TsNZNhgwT9gMNyNuKmTr0eoZAu3nxDO4Tnq3PSu9icpmpLnV6FlD3bCpsw6GdMLJOO5Wh9X+1yb2x3RqPSpRoomXJBc9ug==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t3FB4-0003iq-Km for bug-gnu-emacs@gnu.org; Tue, 22 Oct 2024 09:44: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: Tue, 22 Oct 2024 13:44: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.172960459614222 (code B ref 64055); Tue, 22 Oct 2024 13:44:02 +0000 Original-Received: (at 64055) by debbugs.gnu.org; 22 Oct 2024 13:43:16 +0000 Original-Received: from localhost ([127.0.0.1]:55110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3FAK-0003hJ-5x for submit@debbugs.gnu.org; Tue, 22 Oct 2024 09:43:16 -0400 Original-Received: from sendmail.purelymail.com ([34.202.193.197]:49182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3FAH-0003gz-2h for 64055@debbugs.gnu.org; Tue, 22 Oct 2024 09:43:14 -0400 DKIM-Signature: a=rsa-sha256; b=QOFhF1LgRiu+W50hGmmjzVZEjY8iwcqK66xDCCBMt2JNupKDZ5ur6eix3Z+qVT0Se8esrZjPc7ThJcRCXgWBnXTtNQPAG0e4C7lkiVTAHXuCAbe89z03ROMwRKUTjYtcTPLnjxBTzKKguZZ5tzz1uhOkmOF+n7kLKQB0Kp2ic8b3fTGokDKXDFCDe9czwyvPCs7/95Ly9RRnFcsov3bS/E0hNMbMB0mFPWgWvVKVXfFrb6I3T4tsJ4CFb0rJ7CC7hlaHnzESP6LcuRAX9zkO3ypcGc98xSag1T8YSgOiBHstxvKJsWne6//2zRZwbfp7orWsWFRoXzUEYLh3Z02/Hw==; s=purelymail2; d=spwhitton.name; v=1; bh=6BsaM6iAm+q7TbGNGrqM1ViCyh3gxMg76sGXN2Iw0o8=; h=Received:Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=veGtrENPDyT+WMHI2+6nqStLVqY+i3wn6QloY6AbJSalLMRpIlfpNZl+B+ZEUbV+h1oZQpyRFoymE8hPGgLaWp4DDBphvDtSRb8f41W0l8d5EYUfqqpNCyZnRdm2fpRRiRtBhEO0Ia3MrrQJgrSZ/wBIXx6eqUah8Km0NFOVGDJSiQRPhnxp/j6OvgCwxkrywJPXlIBeY8UgTCoeG1jE4KZoRFeKkCxVo2GUIMiY9fwA0ms9/06EGVU2Mr7rz6GS2SZtW89Ta3gqHSak0LWL6WLBGVsFPdfpwvD88e4UDKoTkpYn4SqPpd+iM8KwUDJ11Zdtwk9FGmh28Dd7fWPHeA==; s=purelymail2; d=purelymail.com; v=1; bh=6BsaM6iAm+q7TbGNGrqM1ViCyh3gxMg76sGXN2Iw0o8=; 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 541473510; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 22 Oct 2024 13:42:37 +0000 (UTC) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id 1E2847EA4CA; Tue, 22 Oct 2024 21:42:33 +0800 (CST) In-Reply-To: <86msiwfesj.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 22 Oct 2024 16:27:56 +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:294105 Archived-At: Hello, On Tue 22 Oct 2024 at 04:27pm +03, Eli Zaretskii wrote: > 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 diff no longer applies to the current master. And I prefer doing > that manually anyway. So let's have those instructions in full > detail. Okay, this should do it: - 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. =D7=90=D7=91=D7=92=D7=93 =C4= =85 =C4=9B =C4=8D --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 --=20 Sean Whitton