From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel 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 Message-ID: <5736664f-95e0-a1b1-1401-ed5767bf651c@yandex.ru> References: <167157777422.12200.17571498176176363284@vcs2.savannah.gnu.org> <20221220230934.BDF4CC00619@vcs2.savannah.gnu.org> <87pmcdzktw.fsf@melete.silentflame.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35371"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 To: Sean Whitton , emacs-devel@gnu.org, Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Dec 21 02:30:53 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p7nwb-000930-9D for ged-emacs-devel@m.gmane-mx.org; Wed, 21 Dec 2022 02:30:53 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7nk4-0000T5-Ku; Tue, 20 Dec 2022 20:17:56 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7njx-0000Pf-BN for emacs-devel@gnu.org; Tue, 20 Dec 2022 20:17:50 -0500 Original-Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7njv-00069F-LU for emacs-devel@gnu.org; Tue, 20 Dec 2022 20:17:49 -0500 Original-Received: by mail-wr1-x431.google.com with SMTP id h16so13499490wrz.12 for ; Tue, 20 Dec 2022 17:17:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=e0gRqbkvUvt8L/Sp1Msx+Y+vhpZXQXCw8VNN3gd2i8A=; b=e+JDNVWRcVkGTKOacw5Xh6AMoR495bF1M9DYHhQgqZPSwsWM0JnylvoKcn1TaNDAy7 4cBLR7RoOihtxPyXuTJW8+wa3TFbn/zAtJcTonfWzYFjynW0oT3z8Xk+ibIbBY6yhjwX rOPKySLj+nARBgDVZC+q+bTQzhx+jw8FD2Tg5mUxU+sahEihCnm3vjbtTTBLrv6fOTgF HeArRKgMns8fxEa0BNy4T7IN6XY7Qy5KNrObpFGTLzk3GJf4aJWhHe+pusA5C9DiL9vp 3q0yhOYnYzbqAWO61NRQ2LMDN+ZeInhHWwB2LMnBb19NzzQNMwJxNhk+VJH+OQDtwyp6 u5+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=e0gRqbkvUvt8L/Sp1Msx+Y+vhpZXQXCw8VNN3gd2i8A=; b=xITeYg4rJWm6tI2ciMvVg8wf6k2ySu12DCrbzSZEgtz8obz+LmpAWUy4F+zHKJnpV2 SWDVYaUlPo9UiVN8dCGOFelDTN2mmITf4PqaohpKMrY1DSnPqvYggkXZfXUgPRGNXABQ Df+fE+KaqpFIbQRLiCM0RSpyn5DlkxkyS6gpXxy4UvVtQr8jI+2TWWyBll/n3C9/mttG 4GRIN0TslpGwZKrfa/+oMp++ymBvps9yeqrD43ONNnxaW6vgUWOjTTtykDULuKWGjI7N H1gsgnUGt+kA0QOZbe+G+08biTTr0E6EFNPKUiuIHw+eqtSVG2wHAUs3Vdxk5WnORr/j 2aIQ== X-Gm-Message-State: AFqh2krJk1ON5zFnfjjM4gWUUogINz3GMyVaDRh2q4cLRqAxIlynhKGl Zh8Q4PI8Ia9ZLH4LtmSAti4= X-Google-Smtp-Source: AMrXdXubN3eGWgT3z8/34MjYmetVF9FN8xuy4kO6+zEvg2xJH5eP7BoMj5rkUE5MgHrqXPFRW3EkTA== X-Received: by 2002:a05:6000:239:b0:242:6665:6523 with SMTP id l25-20020a056000023900b0024266656523mr2862122wrz.52.1671585465648; Tue, 20 Dec 2022 17:17:45 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id i7-20020adffc07000000b00241d544c9b1sm16137891wrr.90.2022.12.20.17.17.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Dec 2022 17:17:45 -0800 (PST) Content-Language: en-US In-Reply-To: <87pmcdzktw.fsf@melete.silentflame.com> Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=raaahh@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-1.161, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:301719 Archived-At: 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 >> Commit: Sean Whitton >> >> 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