Re: master 1424342225 2/2: vc-git-checkin: Don't try to apply an empty patch

[Dmitry Gutov]

On 21/12/2022 02:01, Sean Whitton wrote:
> Hello,
>
> On Tue 20 Dec 2022 at 06:09PM -05, Sean Whitton wrote:
>
> > branch: master
> > commit 1424342225ef5b18c630364dd88e004f4ebb1c7f
> > Author: Sean Whitton<spwhitton@spwhitton.name>
> > Commit: Sean Whitton<spwhitton@spwhitton.name>
> >
> >      vc-git-checkin: Don't try to apply an empty patch
> >
> >      * lisp/vc/vc-git.el (vc-git-checkin): Don't try to apply an empty
> >      patch to the index, because in that case 'git apply' fails.
> This probably should have been committed to the release branch.  Will
> the merge scripts cope if I cherry-pick it onto emacs-29?

To quote admin/notes/git-workflow:

Backporting to release branch
=============================

If you have applied a fix to the master, but then decide that it should
be applied to the release branch, too, then

cd ~/emacs/master
git log

and find the commit you're looking for.  Then find the commit ID,
which will look like

commit 958b768a6534ae6e77a8547a56fc31b46b63710b

cd ~/emacs/emacs-28
git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b

and add "Backport:" to the commit string.  Then

git push