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: Mon, 19 Dec 2022 15:30:17 -0700 Message-ID: <871qovjabq.fsf@melete.silentflame.com> References: <38d4d719-8f3c-9bb6-b141-f7e9ca66333c@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4881"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 60126@debbugs.gnu.org, juri@linkov.net To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 19 23:31:18 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 1p7OfF-00014L-Io for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Dec 2022 23:31:18 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Of1-0001OI-TZ; Mon, 19 Dec 2022 17:31:03 -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 1p7Of0-0001M7-FR for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 17:31: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 1p7Of0-0007Zu-7b for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 17:31:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Oez-0008Kh-Lx for bug-gnu-emacs@gnu.org; Mon, 19 Dec 2022 17:31: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: Mon, 19 Dec 2022 22:31: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.167148903032023 (code B ref 60126); Mon, 19 Dec 2022 22:31:01 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 19 Dec 2022 22:30:30 +0000 Original-Received: from localhost ([127.0.0.1]:40729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7OeU-0008KR-5H for submit@debbugs.gnu.org; Mon, 19 Dec 2022 17:30:30 -0500 Original-Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:48027) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7OeQ-0008KJ-Vn for 60126@debbugs.gnu.org; Mon, 19 Dec 2022 17:30:28 -0500 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 2F9703200947; Mon, 19 Dec 2022 17:30:20 -0500 (EST) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 19 Dec 2022 17:30:20 -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=1671489019; x=1671575419; bh=ug Q23ZUavqK6sdZCaB8F+qdnhfBgPgxTBzLMxmo8UCY=; b=koyTha2EWY0o9b9Ydw Z7UEgmo8B4Iux3odn84buEY+WMOcaVEMDb1Uz41/0tWr1qPlxUBeUZifvq2IGaKT h1n1MB0mJwIvpbY5BCgL4lWpP4mPh6Rc9lsLbqJ4u5uDqsggdSTvy5vmVPbRnGRu e/Vo4PyviD4bDJYasWUsvtDOF3FbLmGMMggiTraHz1vFtYBdLO3DebiVFbvEEZ7e yFG41q/NyMare4freIKF0ig4AkclRGuV0J6S2RREzGntWtF9WH7XZ7Nxkq+5ZyxI GDebuhhnGl1NIZgYEBXp59k8pVywNykrRIC7obBZ+VzTp4iWHDOfH+MxemOLGLRz 2uLg== 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=1671489019; x=1671575419; bh=ugQ23ZUavqK6sdZCaB8F+qdnhfBg PgxTBzLMxmo8UCY=; b=Q/Rt3FXzcqnmXnM0mQ/9XEZ6uCb/BB5bkoHJEW9pw0eH 3EVkg2VKrAhxnW+3/VdZpzeT3/oVVMapQlcAzG0NFzbaO9Q18XW4PahvQBIx81kK ntg9EngEehFTT+naaRkr1Octl7nJsQR7W0aYz3WFdhLGQorgywadq5hkCZTnTBFG N9zRlANQVwkah5Q7Y7z9g1ex4TtdyBZO+ZF3kzwIqMzLdmbGY8RaPxZyVPSEGf8u A1SAG56sknL21EcDh5oHlNnfFpZbxLFCTiA5c/4LvLqyCXwlereeNwf+HMWfckVa khoomiTHzyObN78N+GIcivOmlPJIynwJ1lZQsfP0Xg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrgeefgddufeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefujghffffkfgggtgesthdttddttdertdenucfhrhhomhepufgvrghn ucghhhhithhtohhnuceoshhpfihhihhtthhonhesshhpfihhihhtthhonhdrnhgrmhgvqe enucggtffrrghtthgvrhhnpeefgeduhffhhfeifeeijeeutdehteetjeetffeuieeihffg uddtgfdvkeekfeelteenucffohhmrghinhepshhtrggtkhhovhgvrhhflhhofidrtghomh enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsphif hhhithhtohhnsehsphifhhhithhtohhnrdhnrghmvg X-ME-Proxy: Feedback-ID: i23c04076:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 19 Dec 2022 17:30:19 -0500 (EST) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id 015847E0B44; Mon, 19 Dec 2022 15:30:17 -0700 (MST) In-Reply-To: <38d4d719-8f3c-9bb6-b141-f7e9ca66333c@yandex.ru> (Dmitry Gutov's message of "Sun, 18 Dec 2022 03:08:02 +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:251470 Archived-At: Hello, On Sun 18 Dec 2022 at 03:08AM +02, Dmitry Gutov wrote: > Perhaps we should offer to stash the changes, though? > > Starting with Git 2.13, 'git stash' now has the 'push' subcommand which > accepts individual file names: > > https://stackoverflow.com/a/5506483/615245 > > Or make it a three-way choice with read-multiple-choice. This is a nice suggestion. A step further would be to unconditionally stash and unstash. Given how committing patches with C-x v v works, I don't believe it can ever be the case that the stash is not applicable afterwards? If that's wrong, I'll implement what you suggest. -- Sean Whitton