From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#60126: 30.0.50; vc-git-checkin: Offer to unstage conflicting changes Date: Tue, 20 Dec 2022 19:13:30 +0200 Organization: LINKOV.NET Message-ID: <86v8m6m2y5.fsf@mail.linkov.net> 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> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35871"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 60126@debbugs.gnu.org, Sean Whitton To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 20 19:31:23 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 1p7hOd-0009Al-RD for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Dec 2022 19:31:23 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7gEm-0000ec-DP; Tue, 20 Dec 2022 12:17:08 -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 1p7gEi-0000eQ-FL for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 12:17:05 -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 1p7gEi-0003Go-3Q for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 12:17:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7gEf-00077w-Rf for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 12:17:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Dec 2022 17:17: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.167155656927377 (code B ref 60126); Tue, 20 Dec 2022 17:17:01 +0000 Original-Received: (at 60126) by debbugs.gnu.org; 20 Dec 2022 17:16:09 +0000 Original-Received: from localhost ([127.0.0.1]:46063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7gDp-00077V-JB for submit@debbugs.gnu.org; Tue, 20 Dec 2022 12:16:09 -0500 Original-Received: from relay11.mail.gandi.net ([217.70.178.231]:40225) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7gDj-000775-LE for 60126@debbugs.gnu.org; Tue, 20 Dec 2022 12:16:08 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 554FD10000A; Tue, 20 Dec 2022 17:15:45 +0000 (UTC) In-Reply-To: <392bbde0-9d6e-83c4-0639-af406e279ef1@yandex.ru> (Dmitry Gutov's message of "Tue, 20 Dec 2022 17:13:10 +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:251533 Archived-At: > (I'm not sure if the list of files is passed to this function correctly > when committing a patch; if not, fixing that would also be needed.) A list of files should be correct, but needs more testing to confirm.