From: Sean Whitton <spwhitton@spwhitton.name>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Morgan.J.Smith@outlook.com, 64055@debbugs.gnu.org, dgutov@yandex.ru
Subject: bug#64055: Implementation of modifying VC change comments for Git
Date: Tue, 22 Oct 2024 21:42:33 +0800 [thread overview]
Message-ID: <87a5ewckza.fsf@melete.silentflame.com> (raw)
In-Reply-To: <86msiwfesj.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 22 Oct 2024 16:27:56 +0300")
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! <sha1 of ORIG-REV>\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
--
Sean Whitton
next prev parent reply other threads:[~2024-10-22 13:42 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 22:59 bug#64055: [WIP Patch] Enable editing commit messages - vc-git-modify-change-comment Morgan Smith
2023-06-14 8:00 ` Robert Pluim
2023-06-14 11:41 ` Morgan Smith
2023-06-14 13:13 ` Robert Pluim
2023-06-14 13:54 ` Morgan Smith
2023-06-14 15:30 ` Robert Pluim
2024-10-01 2:38 ` Sean Whitton
2024-10-01 19:32 ` Dmitry Gutov
2024-10-02 0:01 ` Sean Whitton
2024-10-02 23:20 ` Dmitry Gutov
2024-10-10 2:39 ` Sean Whitton
2024-10-10 2:48 ` Sean Whitton
2024-10-17 13:27 ` Sean Whitton
2024-10-18 5:26 ` Eli Zaretskii
2024-10-18 6:20 ` Sean Whitton
2024-10-18 9:14 ` Eli Zaretskii
2024-10-18 9:30 ` Sean Whitton
2024-10-18 12:18 ` Eli Zaretskii
2024-10-20 0:56 ` Sean Whitton
2024-10-20 4:58 ` Eli Zaretskii
2024-10-20 5:29 ` Sean Whitton
2024-10-20 6:09 ` Eli Zaretskii
2024-10-20 7:18 ` Sean Whitton
2024-10-20 8:20 ` Eli Zaretskii
2024-10-20 8:42 ` Sean Whitton
2024-10-20 8:56 ` Eli Zaretskii
2024-10-18 0:46 ` Dmitry Gutov
2024-10-18 4:50 ` Sean Whitton
2024-10-20 0:16 ` Dmitry Gutov
2024-10-20 0:58 ` Sean Whitton
2023-06-17 2:40 ` Dmitry Gutov
2024-10-01 2:37 ` Sean Whitton
2024-10-01 13:35 ` Dmitry Gutov
2024-10-10 2:45 ` Sean Whitton
2024-10-10 6:12 ` Eli Zaretskii
2024-10-10 6:23 ` Sean Whitton
2024-10-10 7:36 ` Eli Zaretskii
2024-10-10 7:46 ` Sean Whitton
2024-10-18 9:26 ` bug#64055: Implementation of modifying VC change comments for Git Sean Whitton
2024-10-19 10:28 ` Eli Zaretskii
2024-10-20 5:19 ` Sean Whitton
2024-10-20 8:32 ` Eli Zaretskii
2024-10-20 8:59 ` Sean Whitton
2024-10-20 9:19 ` Eli Zaretskii
2024-10-20 9:25 ` Sean Whitton
2024-10-20 9:46 ` Sean Whitton
2024-10-20 11:24 ` Eli Zaretskii
2024-10-20 13:11 ` Sean Whitton
2024-10-20 13:52 ` Eli Zaretskii
2024-10-21 0:01 ` Dmitry Gutov
2024-10-21 1:45 ` Sean Whitton
2024-10-21 5:27 ` Eli Zaretskii
2024-10-21 1:52 ` Sean Whitton
2024-10-21 13:48 ` Eli Zaretskii
2024-10-22 8:25 ` Sean Whitton
2024-10-22 13:27 ` Eli Zaretskii
2024-10-22 13:42 ` Sean Whitton [this message]
2024-10-22 14:20 ` Eli Zaretskii
2024-10-22 14:52 ` Sean Whitton
2024-10-20 11:18 ` Eli Zaretskii
2024-10-20 23:55 ` Dmitry Gutov
2024-10-21 2:10 ` Sean Whitton
2024-10-21 0:09 ` Dmitry Gutov
2024-10-21 2:01 ` Sean Whitton
2024-10-21 5:39 ` Eli Zaretskii
2024-10-21 5:46 ` Sean Whitton
2024-10-21 5:49 ` Eli Zaretskii
2024-10-21 19:56 ` Dmitry Gutov
2024-10-22 8:29 ` Sean Whitton
2024-10-21 20:08 ` Dmitry Gutov
2024-10-22 8:30 ` Sean Whitton
2024-10-26 1:58 ` Dmitry Gutov
2024-10-26 3:12 ` Sean Whitton
2024-10-27 1:05 ` Dmitry Gutov
2024-10-27 2:25 ` Sean Whitton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a5ewckza.fsf@melete.silentflame.com \
--to=spwhitton@spwhitton.name \
--cc=64055@debbugs.gnu.org \
--cc=Morgan.J.Smith@outlook.com \
--cc=dgutov@yandex.ru \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.