From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Sean Whitton Newsgroups: gmane.emacs.devel Subject: Re: master 1424342225 2/2: vc-git-checkin: Don't try to apply an empty patch Date: Tue, 20 Dec 2022 17:01:15 -0700 Message-ID: <87pmcdzktw.fsf@melete.silentflame.com> References: <167157777422.12200.17571498176176363284@vcs2.savannah.gnu.org> <20221220230934.BDF4CC00619@vcs2.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="14383"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: emacs-devel@gnu.org, Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Dec 21 01:01:40 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 1p7mYF-0003Xq-Vm for ged-emacs-devel@m.gmane-mx.org; Wed, 21 Dec 2022 01:01:40 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7mXz-0001I6-PQ; Tue, 20 Dec 2022 19:01:23 -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 1p7mXx-0001F1-LI for emacs-devel@gnu.org; Tue, 20 Dec 2022 19:01:21 -0500 Original-Received: from wout3-smtp.messagingengine.com ([64.147.123.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p7mXu-00082H-SA for emacs-devel@gnu.org; Tue, 20 Dec 2022 19:01:20 -0500 Original-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 336D1320090C; Tue, 20 Dec 2022 19:01:17 -0500 (EST) Original-Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 20 Dec 2022 19:01:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1671580876; x=1671667276; bh=jFvYztcdto vG1mqk9aStEqLMtYRAr4+TU1adatwVp5s=; b=Z42+YdPE88MG5jhH+e6P847uzZ 6lHgh6sQCstycAmrBdBhSi172jEz9tCklYSr3SiejBL9o0GOYo0SNJQZ0lz2voo+ L7w1WDwtm3YzxfQWfkm0UARIWNBcdxxVETKDn+xbAgeLl3VBEWMXAmIB03Bauz5B /txgr+2S/y2NG3lXVEDqYu+GUHB1/Kc/QJv7r4zYW/WCkUTE3s83lj1ZRhjaSkqk DBASyFPfrXnElK1PqsB+klWbk+j14jatx5gqmqDmyCPX47VGmtUeUR90xkwdLU+V Z1AlyovT6I09WrIr1v7ob4XiQFowCsbSyc4PXz7o3GjcILxqPvXXEs8Uz9dA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1671580876; x=1671667276; bh=jFvYztcdtovG1mqk9aStEqLMtYRA r4+TU1adatwVp5s=; b=SPHNsZtuVsPPST+JdbMCvbODcyWV3eWu9gjhGrcNOWOK TYs6Jr/HaWT38Cey3YnP0TT6ru3pfvG4md+RUvmrEOONTHsdLFRWLAwaKLscDPbW ISJTZyTyLQ+oBQ/Idk5QfOUVE92OLxlclUcOHgZSdTYKPrJwYcAhfWMhM0A99MGw 7N2DRjKGOGrGbrysKMsBF3izUKlDTE/xXch3JiAq4xQBZ8XDr5zqydviu9W2jpV+ gdNu6vefMHhESblDthNB104T32qng53WOSUJLJedIt2lQNkqdF5AOi8ZXD/FCu1F WVjps50gA7pV0xisanjUNCsaiJhg/9tETl1D2xncBA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgeejgddujecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffujghffffkfgggtgesthdttddttdertdenucfhrhhomhepufgvrghnucgh hhhithhtohhnuceoshhpfihhihhtthhonhesshhpfihhihhtthhonhdrnhgrmhgvqeenuc ggtffrrghtthgvrhhnpeffueettdefvddtteevgfeufeejgfegudfgfedutdegfeetkeeh uddvfeejjeeifeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvg X-ME-Proxy: Feedback-ID: i23c04076:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 20 Dec 2022 19:01:16 -0500 (EST) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id 6C6A17EFB05; Tue, 20 Dec 2022 17:01:15 -0700 (MST) In-Reply-To: <20221220230934.BDF4CC00619@vcs2.savannah.gnu.org> (Sean Whitton's message of "Tue, 20 Dec 2022 18:09:34 -0500 (EST)") Received-SPF: pass client-ip=64.147.123.19; envelope-from=spwhitton@spwhitton.name; helo=wout3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-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:301714 Archived-At: 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? -- Sean Whitton