I agree that we shouldn't go change Git history.

One way we could fix this is by making an empty commit after the fact, with
just the description of what you wanted to do. So something like

git commit --allow-empty -m "patch 9.0.1234 something do
something\n\n(empty commit to add back description)\nProblem…"

Someone looking at the Git history could be slightly confused but at least
there's something there in the history as a record. It wasn't that many
commits anyway to be too confusing.

Another way to do this is to revert the commit and then commit again, with
the description. This way, the commit the patch *again* with message would
actually contain the diff so Git blame would work better, but it could be a
little convoluted if someone is digging through history and see the
commit->revert->commit. But it would be something like:

git revert <problematic_commit>
git revert --no-commit HEAD
git commit -m "patch 9.0.12345\n\nsome message…"

git show # Just to sanity check you did the right things
git show HEAD~

Glad to hear you are doing well! I'm submitting a couple related
smoothscroll bug fixes, but please just take a look when you have time.


On Fri, Nov 4, 2022 at 12:01 PM Bram Moolenaar <[email protected]> wrote:

>
> Brief info: I am receiving treatment and it is going very well.  More
> tests are needed and more treatment may be needed, but so far it is
> looking good.  I hope to be home again next week.  But don't expect full
> speed bug fixing just yet! :-)
>
> Please do keep creating PRs, it's easier to handle those than to create
> fixes myself.
>
> Thanks for all the wishes, it helps a lot to know you are caring.
>
> --
> Friends?  I have lots of friends!  In fact, I have all episodes ever made.
>
>  /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net
>  \\\
> ///
> \\\
> \\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/
> ///
>  \\\            help me help AIDS victims -- http://ICCF-Holland.org
> ///
>
> --
> --
> You received this message from the "vim_dev" maillist.
> Do not top-post! Type your reply below the text you are replying to.
> For more information, visit http://www.vim.org/maillist.php
>
> ---
> You received this message because you are subscribed to the Google Groups
> "vim_dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to [email protected].
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/vim_dev/20221104190107.D78261C0739%40moolenaar.net
> .
>

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/CAHTeOx9GZ4cpgE9570FeY2TQz4JFkBPDn3vN0SNV%2BC7KcLi6_g%40mail.gmail.com.

Raspunde prin e-mail lui