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.bugs Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Date: Fri, 23 Dec 2022 19:03:11 -0700 Message-ID: <87v8m17e3k.fsf@melete.silentflame.com> References: <38d4d719-8f3c-9bb6-b141-f7e9ca66333c@yandex.ru> <871qovjabq.fsf@melete.silentflame.com> <4513ac99-76d1-cdd6-fcc9-59208b5002f3@yandex.ru> <87zgbih8wv.fsf@melete.silentflame.com> <392bbde0-9d6e-83c4-0639-af406e279ef1@yandex.ru> <87h6xqgg65.fsf@melete.silentflame.com> <87zgbh1xkn.fsf@melete.silentflame.com> <4910f545-d7b1-9f6b-8262-fd7fc89d589d@yandex.ru> <87h6xnasgn.fsf@melete.silentflame.com> <878riybwhy.fsf@melete.silentflame.com> <835ye28rgm.fsf@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="27577"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: juri@linkov.net, 60126@debbugs.gnu.org, dgutov@yandex.ru To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 24 03:04:10 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1p8ttR-0006vl-5y for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 24 Dec 2022 03:04:10 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8ttM-0008DO-2K; Fri, 23 Dec 2022 21:04:04 -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 1p8ttK-000894-Bi for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 21:04:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p8ttK-0005R5-2d for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 21:04:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p8ttJ-0005GF-Td for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 21:04:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 24 Dec 2022 02:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60126 X-GNU-PR-Package: emacs Original-Received: via spool by 60126-submit@debbugs.gnu.org id=B60126.167184740020209 (code B ref 60126); Sat, 24 Dec 2022 02:04:01 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 24 Dec 2022 02:03:20 +0000 Original-Received: from localhost ([127.0.0.1]:40058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8tsd-0005Ft-Ke for submit@debbugs.gnu.org; Fri, 23 Dec 2022 21:03:19 -0500 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:41807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8tsb-0005Fn-AT for 60126@debbugs.gnu.org; Fri, 23 Dec 2022 21:03:17 -0500 Original-Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 463825C0374; Fri, 23 Dec 2022 21:03:12 -0500 (EST) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 23 Dec 2022 21:03:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=cc: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=1671847392; x=1671933792; bh=1Z H785/T54CgWc+Hfe9swSyEhixnbXm/N0puO8Q2CEo=; b=OYPGjVTHqOIMxcz/1e dN+Li3lnHHgW/fRyQSW+6yOjfK0+vAWAh2z4b0etHpF6L8bRwQSSQ/S0aaOLnUdh nPp5f02SbHzXtivwb7aMTWvvvl7I8Zbvy/4+a3FFnR1vbBuFAB+sK9nkHk+2P6JF 8B7COvz+7jdvak++MZVT+Ay0WxrBlNbex+/VNB+JQI1ucZ/X+q/Vp/ZAIfiCsiTj FhJz1KqkeD41OA/p05i+g9VBw2H1BSgEBgcdz8IfQFGXHnQtD60yU08wI7HYqcka VMN1qiW2Gf9J6sblTi7gICwbsN6SRCQmmcghAx9qH2REJLBNQ5szIembBINzvZ/s h8Hg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc: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=1671847392; x=1671933792; bh=1ZH785/T54CgWc+Hfe9swSyEhixn bXm/N0puO8Q2CEo=; b=wJGxFiiO1/HN9YpY/p6/vSG9GkCdmk1Kqbm9Y9G/wuju IbYBZmp+ojgBG9ilzbDJp5+t3zyZaKhr4A8HM0RXiNZI9m3WmHU5uJ73zC62BaDE 10dZn/vVA64MrpFH8+Pbk1anpHu3lp2W9HGXhJAOESnscs28/5VrU6qDNM0WLoUg 8ZHPI9w1NJutdwfK8zNXHeP+W64xukQXwT15X6GhTOi9wutnGFHNpe2tHz+qbdzu uvxX2luEWJIkjtCEpfd1O7X5HF4iM6a83k22sZc714RTyoLq89wnZ51E1pBNlV73 cTiMS9HbabXPSv0cFVgSvm5pc1b2hyh/kVSRolIBeA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrheefgdegvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufgjfhffkfgfgggtsehttddttddtredtnecuhfhrohhmpefuvggrnhcu hghhihhtthhonhcuoehsphifhhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvgeqne cuggftrfgrthhtvghrnheptdffvdffueeluedvteekvdevhefghedvgeevgffhvedukeeg geelveegjeekteeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepshhpfihhihhtthhonhesshhpfihhihhtthhonhdrnhgrmhgv X-ME-Proxy: Feedback-ID: i23c04076:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 23 Dec 2022 21:03:11 -0500 (EST) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id 4456C7ECE9A; Fri, 23 Dec 2022 19:03:11 -0700 (MST) In-Reply-To: <835ye28rgm.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 23 Dec 2022 10:16:57 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:251758 Archived-At: Hello, On Fri 23 Dec 2022 at 10:16AM +02, Eli Zaretskii wrote: >> Cc: 60126@debbugs.gnu.org, juri@linkov.net >> From: Sean Whitton >> Date: Thu, 22 Dec 2022 20:59:53 -0700 >> >> + ;; Prepare stash commit object, which has a special structure. >> + (let* ((tree-commit (git-string "commit-tree" "-m" message > > Can 'message' include newlines? if so, we need to either convert the > newlines to spaces, or invoke the command with -F instead, writing the > message to a temporary file. Because otherwise this will fail on > Windows. Ah, thank you. These "messages" are more like labels, or names, than commit messages. I've gone ahead and hard coded it for the time being. -- Sean Whitton