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#52349: 29.0.50; vc-git and diff-mode: stage hunks Date: Tue, 07 Dec 2021 21:06:29 +0200 Organization: LINKOV.NET Message-ID: <864k7kfd56.fsf@mail.linkov.net> References: <268cee0d-465d-b862-d1d6-f5da4d69e737@inventati.org> <9106387a-98cf-396f-bf45-ccb04581787b@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="31570"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (x86_64-pc-linux-gnu) Cc: Manuel Uberti , 52349@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 07 20:14:51 2021 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 1mufvO-00081o-9x for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 07 Dec 2021 20:14:50 +0100 Original-Received: from localhost ([::1]:57452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mufvN-0002lg-A9 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 07 Dec 2021 14:14:49 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:46540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mufuc-0001yU-Cv for bug-gnu-emacs@gnu.org; Tue, 07 Dec 2021 14:14:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:55350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mufuc-00028Y-5M for bug-gnu-emacs@gnu.org; Tue, 07 Dec 2021 14:14:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mufuc-0000EA-1Q for bug-gnu-emacs@gnu.org; Tue, 07 Dec 2021 14:14:02 -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, 07 Dec 2021 19:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52349 X-GNU-PR-Package: emacs Original-Received: via spool by 52349-submit@debbugs.gnu.org id=B52349.1638904425834 (code B ref 52349); Tue, 07 Dec 2021 19:14:01 +0000 Original-Received: (at 52349) by debbugs.gnu.org; 7 Dec 2021 19:13:45 +0000 Original-Received: from localhost ([127.0.0.1]:38662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mufuK-0000DN-Ih for submit@debbugs.gnu.org; Tue, 07 Dec 2021 14:13:45 -0500 Original-Received: from relay7-d.mail.gandi.net ([217.70.183.200]:46269) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mufuE-0000Cr-Uw for 52349@debbugs.gnu.org; Tue, 07 Dec 2021 14:13:43 -0500 Original-Received: (Authenticated sender: juri@linkov.net) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id D199D20009; Tue, 7 Dec 2021 19:13:31 +0000 (UTC) In-Reply-To: <9106387a-98cf-396f-bf45-ccb04581787b@yandex.ru> (Dmitry Gutov's message of "Tue, 7 Dec 2021 20:10:54 +0300") 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" Xref: news.gmane.io gmane.emacs.bugs:221866 Archived-At: >> It's probably something diff-hl does as well by now (I have not checked). > > It does, since recently. > > But Juri's approach seems like it will fit VC's design better, given that > we don't have a semantic way to "show all stages hunks" or commit them only > (or instruct Emacs to do that). The problem is that 'git apply --cached' doesn't perform the merge with other changes in the same file, whereas 'git stash pop' merges committed changes with uncommitted changes.