* Re: master 1424342225 2/2: vc-git-checkin: Don't try to apply an empty patch [not found] ` <20221220230934.BDF4CC00619@vcs2.savannah.gnu.org> @ 2022-12-21 0:01 ` Sean Whitton 2022-12-21 1:17 ` Dmitry Gutov 0 siblings, 1 reply; 4+ messages in thread From: Sean Whitton @ 2022-12-21 0:01 UTC (permalink / raw) To: emacs-devel, Stefan Kangas 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? -- Sean Whitton ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: master 1424342225 2/2: vc-git-checkin: Don't try to apply an empty patch 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 2022-12-21 17:30 ` Eli Zaretskii 0 siblings, 1 reply; 4+ messages in thread From: Dmitry Gutov @ 2022-12-21 1:17 UTC (permalink / raw) To: Sean Whitton, emacs-devel, Stefan Kangas 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: master 1424342225 2/2: vc-git-checkin: Don't try to apply an empty patch 2022-12-21 1:17 ` Dmitry Gutov @ 2022-12-21 17:30 ` Eli Zaretskii 2022-12-22 20:40 ` Sean Whitton 0 siblings, 1 reply; 4+ messages in thread From: Eli Zaretskii @ 2022-12-21 17:30 UTC (permalink / raw) To: Dmitry Gutov; +Cc: spwhitton, emacs-devel, stefankangas > Date: Wed, 21 Dec 2022 03:17:44 +0200 > From: Dmitry Gutov <dgutov@yandex.ru> > > > 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 Actually, if you use -xe, there's no need for the "Backport" thing, since gitmerge.el will also recognize the line inserted by -xe. ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: master 1424342225 2/2: vc-git-checkin: Don't try to apply an empty patch 2022-12-21 17:30 ` Eli Zaretskii @ 2022-12-22 20:40 ` Sean Whitton 0 siblings, 0 replies; 4+ messages in thread From: Sean Whitton @ 2022-12-22 20:40 UTC (permalink / raw) To: Eli Zaretskii, Dmitry Gutov; +Cc: emacs-devel Thank you both. -- Sean Whitton ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-22 20:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[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
2022-12-21 17:30 ` Eli Zaretskii
2022-12-22 20:40 ` Sean Whitton
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).