From: Dmitry Gutov <dgutov@yandex.ru>
To: Sean Whitton <spwhitton@spwhitton.name>,
emacs-devel@gnu.org, Stefan Kangas <stefankangas@gmail.com>
Subject: Re: master 1424342225 2/2: vc-git-checkin: Don't try to apply an empty patch
Date: Wed, 21 Dec 2022 03:17:44 +0200 [thread overview]
Message-ID: <5736664f-95e0-a1b1-1401-ed5767bf651c@yandex.ru> (raw)
In-Reply-To: <87pmcdzktw.fsf@melete.silentflame.com>
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
next prev parent reply other threads:[~2022-12-21 1:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <167157777422.12200.17571498176176363284@vcs2.savannah.gnu.org>
[not found] ` <20221220230934.BDF4CC00619@vcs2.savannah.gnu.org>
2022-12-21 0:01 ` master 1424342225 2/2: vc-git-checkin: Don't try to apply an empty patch Sean Whitton
2022-12-21 1:17 ` Dmitry Gutov [this message]
2022-12-21 17:30 ` Eli Zaretskii
2022-12-22 20:40 ` 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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5736664f-95e0-a1b1-1401-ed5767bf651c@yandex.ru \
--to=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
--cc=spwhitton@spwhitton.name \
--cc=stefankangas@gmail.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).