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:02:14 -0700 Message-ID: <8735958spl.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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="25401"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 60126-done@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 Sat Dec 24 03:03:43 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 1p8tt0-0006N1-6N for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 24 Dec 2022 03:03:42 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8tsY-0006XJ-GM; Fri, 23 Dec 2022 21:03:14 -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 1p8tsP-0006WT-5u for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 21:03:06 -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 1p8tsM-0002nE-Lb for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 21:03:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p8tsM-0005FH-5T for bug-gnu-emacs@gnu.org; Fri, 23 Dec 2022 21:03:02 -0500 Resent-From: Sean Whitton Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sat, 24 Dec 2022 02:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 60126 X-GNU-PR-Package: emacs Mail-Followup-To: 60126@debbugs.gnu.org, spwhitton@spwhitton.name, spwhitton@spwhitton.name Original-Received: via spool by 60126-done@debbugs.gnu.org id=D60126.167184734620133 (code D ref 60126); Sat, 24 Dec 2022 02:03:01 +0000 Original-Received: (at 60126-done) by debbugs.gnu.org; 24 Dec 2022 02:02:26 +0000 Original-Received: from localhost ([127.0.0.1]:40046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8trm-0005Ef-7Y for submit@debbugs.gnu.org; Fri, 23 Dec 2022 21:02:26 -0500 Original-Received: from out2-smtp.messagingengine.com ([66.111.4.26]:57335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8trj-0005EX-Ol for 60126-done@debbugs.gnu.org; Fri, 23 Dec 2022 21:02:24 -0500 Original-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 9F3A05C0372; Fri, 23 Dec 2022 21:02:16 -0500 (EST) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 23 Dec 2022 21:02:16 -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=1671847336; x=1671933736; bh=NO OXPMibGXIV3KdtIWGBWyyeEhE6iU/tNksO54N0y8A=; b=hvY9zljb6lPKui+NRd xc1EIL6Sj36BiP166M6Wn7gt8TV9iKDWnuwUQtLDHKXqj4Q0Ao6Tf9zKOLbhyCJS CU70pBTD7jYU0kSOE9gw7KxqKRN7tgp7m7PwB4nt1Dgp8AgfsffHQfsIYR1fE7av D66KrwNrQYiuPkmCmA14AyqvyUKmYQAr3zrB9tsk/VzXTRVofISr81TtS2fjYr+b nKhEBBkkXHQfoe4gB85M4b3CMPOc1B1TVEmAYDFb+CBynsAeGJk3fNweh1zEWXiD 7SZ8dmAgIznmkda+5LEjAf5CDy1yGgiTz2JHMej6ieB2EOlqATSWzoE6jw1T/Wdh SYhg== 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=1671847336; x=1671933736; bh=NOOXPMibGXIV3KdtIWGBWyyeEhE6 iU/tNksO54N0y8A=; b=XK5mPgUsHrV65aV1yCTNCH4Gvj+BPYGQxr4PMLnPXciN F7aJsKanYuHP2i0xQrAFBnueC36yBfTVFE3pQ2H1EfOM19oNS3jOAYO+DnRj/D60 AspynqjJ1hk0tsq21CiScr7B+DyrSJQ1kw8X1F521RYrJm3LH8TVdV9w/g7hA2UY aKvNewaXzI5A6djtf4K4QKFbbvVkuAf4eXl96odk98BKX14nLY8fd6fhchUztcmW K4JkJIuz2opT0cqUTKYxxWnxXK4kpMJcdxvZZ+FHFBWlJmi4ifOhNQnAujV55+p2 4Zs9xd2tIcfZPWo0x6fWNDbqOAcfibGFMd67EnnHvg== 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:02:16 -0500 (EST) Original-Received: by melete.silentflame.com (Postfix, from userid 1000) id 988397ECE9A; Fri, 23 Dec 2022 19:02:14 -0700 (MST) In-Reply-To: (Dmitry Gutov's message of "Sat, 24 Dec 2022 01:18:28 +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:251757 Archived-At: Hello, On Sat 24 Dec 2022 at 01:18AM +02, Dmitry Gutov wrote: > On 23/12/2022 05:59, Sean Whitton wrote: >> It works, except that sometimes the let-binding of process-environment >> fails, such that the commands affect the normal index rather than the >> temporary index. Can you see what I'm doing wrong there? > > Could you describe be "sometimes" occurrences? Does that happen through > repeating a similar action several times? Or slightly different actions? > > The process-environment setup seems fine. We did corrupt it in 1-2 places in > the past using 'setenv', but I don't see anything like that in the current > codebase. And the effect would probably be different anyway. Thank you for looking. Slightly embarassingly, I can't reproduce the problem today. So I've gone ahead and pushed. I am pretty happy with this approach, in the end. Compared with other possible uses of 'git stash', it's quite clean: - it doesn't touch the worktree copies of the files not involved in the commit - it stashes a single diff, rather than two diffs (one for the worktree and one for the index), which is less for the user to deal with if manual recovery becomes required. Thanks again for the helpful discussion on this one. -- Sean Whitton