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: Wed, 24 Aug 2022 21:20:39 +0300 Organization: LINKOV.NET Message-ID: <864jy1mrk8.fsf@mail.linkov.net> References: <268cee0d-465d-b862-d1d6-f5da4d69e737@inventati.org> <9106387a-98cf-396f-bf45-ccb04581787b@yandex.ru> <864k7kfd56.fsf@mail.linkov.net> <86fsr3uen2.fsf@mail.linkov.net> <95d2d999-49ad-13c4-9f25-0935650a1e42@yandex.ru> <8635ktjfll.fsf@mail.linkov.net> <36b963e4-5af7-dd9e-af92-4404541b9f4d@yandex.ru> <86v8xjx45h.fsf@mail.linkov.net> <861qt9h1hh.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39791"; 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: 52349@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Aug 24 20:25:56 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 1oQv4d-000AAe-9D for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 24 Aug 2022 20:25:55 +0200 Original-Received: from localhost ([::1]:44320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQv4b-0001qA-So for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 24 Aug 2022 14:25:53 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQv3t-0001q0-Rb for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2022 14:25:09 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:58448) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQv3m-0003hC-6z for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2022 14:25:06 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oQv3l-0005B5-Tb for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2022 14:25:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Aug 2022 18:25: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.166136549719890 (code B ref 52349); Wed, 24 Aug 2022 18:25:01 +0000 Original-Received: (at 52349) by debbugs.gnu.org; 24 Aug 2022 18:24:57 +0000 Original-Received: from localhost ([127.0.0.1]:48197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQv3g-0005Ak-SP for submit@debbugs.gnu.org; Wed, 24 Aug 2022 14:24:57 -0400 Original-Received: from relay6-d.mail.gandi.net ([217.70.183.198]:57797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQv3f-0005AW-CY for 52349@debbugs.gnu.org; Wed, 24 Aug 2022 14:24:56 -0400 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id F0D4AC0006; Wed, 24 Aug 2022 18:24:47 +0000 (UTC) In-Reply-To: (Dmitry Gutov's message of "Wed, 24 Aug 2022 05:06:34 +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:240652 Archived-At: >>> Perhaps we should also check that there are no existing staged changes for >>> those files, and if so, abort? This way we won't commit anything else by >>> accident. >> Will do later. > > Shouldn't be too hard, if we don't try to do it eagerly. Just add a check > inside (when vc-git-patch-string ...) in vc-git-checkin. This uses the same command `git diff --cached --quiet` as in commit-patch that you mentioned earlier https://github.com/caldwell/commit-patch/blob/master/commit-patch#L215-L217 (but with an error message shorter than "Cowardly refusing to do anything potentially harmful":) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 8458b40714..fa09ecf472 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -944,6 +944,8 @@ vc-git-checkin (let ((default-directory (file-name-directory file1))) (make-nearby-temp-file "git-msg"))))) (when vc-git-patch-string + (unless (eq (vc-git-command nil t nil "diff" "--cached" "--quiet") 0) + (error "Index not empty")) (let ((patch-file (make-temp-file "git-patch"))) (with-temp-file patch-file (insert vc-git-patch-string))