From unknown Wed Jun 25 00:26:00 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19386: 24.4.51; vc-git-dir-status shows edited files as up-to-date when FILES is non-nil Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 15 Dec 2014 14:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19386 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 19386@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.141865279521868 (code B ref -1); Mon, 15 Dec 2014 14:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Dec 2014 14:13:15 +0000 Received: from localhost ([127.0.0.1]:46549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y0WOg-0005ge-OI for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51236) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y0WOe-0005gO-TH for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0WOT-0004cZ-TI for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:07 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_20,FREEMAIL_FROM, RCVD_IN_BL_SPAMCOP_NET,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:50125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WOT-0004cQ-QT for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WON-0004B4-RG for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:13:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0WOH-0004UU-I0 for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:12:55 -0500 Received: from mail-wg0-x232.google.com ([2a00:1450:400c:c00::232]:51507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WOH-0004U4-BK for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:12:49 -0500 Received: by mail-wg0-f50.google.com with SMTP id a1so14808551wgh.9 for ; Mon, 15 Dec 2014 06:12:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:mime-version:content-type; bh=GO/uAGFaxsbHUhZAi4VkJhZIxhGf5ZxxW0HbLA2LCn8=; b=PV+XnpPg6+JD/0Z3CHWw4oGUUjIHWijjERYZn4aOwcrEAIX7WShXYm33SvZWKqaANB zs5EnJBLl5g9Bo6N7c5Uupsn2cNp/YkluA4Lv1G95tlSFssH4zYFkaMaqQq09N9zz8sZ KpVpZeM/BEXCna8xvcXW+RvNVOZl2wTY+zQgR8in7pRuQZk2PgH2hkZKd9HwIQq2ixMe s5tg++F1m7B2NQAYG1/ZVkI1AYwaA40OjVApJUq4IG7ji02nLJUOUhK3GSUlXISLxWHK 6XA5wE2p+crpQ3MnGXsEazvjZYea0PLBEACQwXan/sTRFUGN3JxFScMOePpeE1EeREiR z14Q== X-Received: by 10.180.85.4 with SMTP id d4mr31598338wiz.36.1418652768837; Mon, 15 Dec 2014 06:12:48 -0800 (PST) Received: from axl ([82.102.93.58]) by mx.google.com with ESMTPSA id vm8sm13205855wjc.6.2014.12.15.06.12.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Dec 2014 06:12:48 -0800 (PST) From: Dmitry Gutov Date: Mon, 15 Dec 2014 16:12:45 +0200 Message-ID: <86y4q9ypb6.fsf@yandex.ru> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -2.8 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Because the `up-to-date' stage in `vc-git-after-dir-status-stage' calls 'git ls-files -z -c -s -- file1 file2 file3', and that output includes modified files (but not unregistered or ignored). To reproduce: ~/vc$ git init test Initialized empty Git repository in /home/gutov/vc/test/.git/ ~/vc$ cd test ~/vc/test$ echo foo > foo ~/vc/test$ touch .gitignore ~/vc/test$ git add .gitignore ~/vc/test$ git commit -m "Add .gitignore" [master (root-commit) e416e1c] Add .gitignore 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore ~/vc/test$ echo bar > .gitignore ~/vc/test$ echo bar > bar ~/vc/test$ git add foo ~/vc/test$ git commit -m "Add foo" [master 3a47057] Add foo 1 file changed, 1 insertion(+) create mode 100644 foo gutov@axl:~/vc/test$ touch tee gutov@axl:~/vc/test$ PATH=~/vc/emacs-24/src:$PATH emacs --batch --eval "(let (done) (vc-call-backend 'Git 'dir-status-files \".\" '(\"foo\" \"bar\" \"tee\" \".gitignore\") nil (lambda (entries &optional mtc) (message \"%s\" entries) (setq done (not mtc)))) (while (not done) (sleep-for 0.1)))" ((.gitignore up-to-date [cl-struct-vc-git-extra-fileinfo 33188 33188 nil nil]) (foo up-to-date [cl-struct-vc-git-extra-fileinfo 33188 33188 nil nil])) ((tee unregistered [cl-struct-vc-git-extra-fileinfo 0 0 nil nil])) ((bar ignored [cl-struct-vc-git-extra-fileinfo 0 0 nil nil])) The .gitignore entry above should be `edited'. The easiest solution seems to be to move the `up-to-date' stage to after `diff-index'. Fix forthcoming. In GNU Emacs 24.4.51.5 (x86_64-unknown-linux-gnu, GTK+ Version 3.10.8) of 2014-12-11 on axl Repository revision: 0c2f254bc3d69ba08a59037e8e192d5d7fb7d816 Windowing system distributor `The X.Org Foundation', version 11.0.11501000 System Description: Ubuntu 14.04.1 LTS From unknown Wed Jun 25 00:26:00 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Dmitry Gutov Subject: bug#19386: closed (Re: bug#19386: Acknowledgement (24.4.51; vc-git-dir-status shows edited files as up-to-date when FILES is non-nil)) Message-ID: References: <548EF699.3090004@yandex.ru> <86y4q9ypb6.fsf@yandex.ru> X-Gnu-PR-Message: they-closed 19386 X-Gnu-PR-Package: emacs Reply-To: 19386@debbugs.gnu.org Date: Mon, 15 Dec 2014 14:57:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1418655423-26398-1" This is a multi-part message in MIME format... ------------=_1418655423-26398-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #19386: 24.4.51; vc-git-dir-status shows edited files as up-to-date when FI= LES is non-nil which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 19386@debbugs.gnu.org. --=20 19386: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D19386 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1418655423-26398-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 19386-done) by debbugs.gnu.org; 15 Dec 2014 14:56:39 +0000 Received: from localhost ([127.0.0.1]:47063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y0X4g-0006rY-At for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:56:38 -0500 Received: from mail-wg0-f45.google.com ([74.125.82.45]:45117) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y0X4d-0006rS-Vy for 19386-done@debbugs.gnu.org; Mon, 15 Dec 2014 09:56:36 -0500 Received: by mail-wg0-f45.google.com with SMTP id b13so14934914wgh.18 for <19386-done@debbugs.gnu.org>; Mon, 15 Dec 2014 06:56:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=QJp1YSRlujF+ACZq1dGBPSrfNGkjnfjHdgkmwd2ZwY8=; b=Is2SM+7Jr1sz/eWLibdyWxv7PmCXbIbjFEIhBDS8Dzy7pMqRUFQMXIK6kwc5NyFurl UjCQzvpY3oQGYFfFiQwCCVpGLd3Ia6f+Rua28ovrQtXnys07B4JhfX6/5fgnfRFQLiPI YRj4WXakV6nQVKZpzPPXTkW/ke/CZUyiTvejcSWAemAPykPaE8DNe2jj+Mj65PENBU3P BR3MYlkx61LH/R7AKeGEBcmWBML4xgtckNUVT9e1RUwmdpTVTpuU4G9tnEgG0sMnS/9R i+W9UWQFK3iRj1IIN4BAeBngMrZfy4UAzeFqm9Wy/Wa2Y9bmSSMgjkjXZLTReE4gOnq0 LoBg== X-Received: by 10.180.77.79 with SMTP id q15mr31723937wiw.8.1418655390283; Mon, 15 Dec 2014 06:56:30 -0800 (PST) Received: from [192.168.1.2] ([82.102.93.58]) by mx.google.com with ESMTPSA id r3sm13435791wic.10.2014.12.15.06.56.28 for <19386-done@debbugs.gnu.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Dec 2014 06:56:29 -0800 (PST) Message-ID: <548EF699.3090004@yandex.ru> Date: Mon, 15 Dec 2014 16:56:25 +0200 From: Dmitry Gutov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: 19386-done@debbugs.gnu.org Subject: Re: bug#19386: Acknowledgement (24.4.51; vc-git-dir-status shows edited files as up-to-date when FILES is non-nil) References: <86y4q9ypb6.fsf@yandex.ru> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: 19386-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.6 (/) Version: 24.5 Fixed on emacs-24. ------------=_1418655423-26398-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 15 Dec 2014 14:13:15 +0000 Received: from localhost ([127.0.0.1]:46549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y0WOg-0005ge-OI for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51236) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y0WOe-0005gO-TH for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0WOT-0004cZ-TI for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:07 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: * X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_20,FREEMAIL_FROM, RCVD_IN_BL_SPAMCOP_NET,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:50125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WOT-0004cQ-QT for submit@debbugs.gnu.org; Mon, 15 Dec 2014 09:13:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WON-0004B4-RG for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:13:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0WOH-0004UU-I0 for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:12:55 -0500 Received: from mail-wg0-x232.google.com ([2a00:1450:400c:c00::232]:51507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0WOH-0004U4-BK for bug-gnu-emacs@gnu.org; Mon, 15 Dec 2014 09:12:49 -0500 Received: by mail-wg0-f50.google.com with SMTP id a1so14808551wgh.9 for ; Mon, 15 Dec 2014 06:12:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:mime-version:content-type; bh=GO/uAGFaxsbHUhZAi4VkJhZIxhGf5ZxxW0HbLA2LCn8=; b=PV+XnpPg6+JD/0Z3CHWw4oGUUjIHWijjERYZn4aOwcrEAIX7WShXYm33SvZWKqaANB zs5EnJBLl5g9Bo6N7c5Uupsn2cNp/YkluA4Lv1G95tlSFssH4zYFkaMaqQq09N9zz8sZ KpVpZeM/BEXCna8xvcXW+RvNVOZl2wTY+zQgR8in7pRuQZk2PgH2hkZKd9HwIQq2ixMe s5tg++F1m7B2NQAYG1/ZVkI1AYwaA40OjVApJUq4IG7ji02nLJUOUhK3GSUlXISLxWHK 6XA5wE2p+crpQ3MnGXsEazvjZYea0PLBEACQwXan/sTRFUGN3JxFScMOePpeE1EeREiR z14Q== X-Received: by 10.180.85.4 with SMTP id d4mr31598338wiz.36.1418652768837; Mon, 15 Dec 2014 06:12:48 -0800 (PST) Received: from axl ([82.102.93.58]) by mx.google.com with ESMTPSA id vm8sm13205855wjc.6.2014.12.15.06.12.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Dec 2014 06:12:48 -0800 (PST) From: Dmitry Gutov To: bug-gnu-emacs@gnu.org Subject: 24.4.51; vc-git-dir-status shows edited files as up-to-date when FILES is non-nil Date: Mon, 15 Dec 2014 16:12:45 +0200 Message-ID: <86y4q9ypb6.fsf@yandex.ru> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Because the `up-to-date' stage in `vc-git-after-dir-status-stage' calls 'git ls-files -z -c -s -- file1 file2 file3', and that output includes modified files (but not unregistered or ignored). To reproduce: ~/vc$ git init test Initialized empty Git repository in /home/gutov/vc/test/.git/ ~/vc$ cd test ~/vc/test$ echo foo > foo ~/vc/test$ touch .gitignore ~/vc/test$ git add .gitignore ~/vc/test$ git commit -m "Add .gitignore" [master (root-commit) e416e1c] Add .gitignore 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore ~/vc/test$ echo bar > .gitignore ~/vc/test$ echo bar > bar ~/vc/test$ git add foo ~/vc/test$ git commit -m "Add foo" [master 3a47057] Add foo 1 file changed, 1 insertion(+) create mode 100644 foo gutov@axl:~/vc/test$ touch tee gutov@axl:~/vc/test$ PATH=~/vc/emacs-24/src:$PATH emacs --batch --eval "(let (done) (vc-call-backend 'Git 'dir-status-files \".\" '(\"foo\" \"bar\" \"tee\" \".gitignore\") nil (lambda (entries &optional mtc) (message \"%s\" entries) (setq done (not mtc)))) (while (not done) (sleep-for 0.1)))" ((.gitignore up-to-date [cl-struct-vc-git-extra-fileinfo 33188 33188 nil nil]) (foo up-to-date [cl-struct-vc-git-extra-fileinfo 33188 33188 nil nil])) ((tee unregistered [cl-struct-vc-git-extra-fileinfo 0 0 nil nil])) ((bar ignored [cl-struct-vc-git-extra-fileinfo 0 0 nil nil])) The .gitignore entry above should be `edited'. The easiest solution seems to be to move the `up-to-date' stage to after `diff-index'. Fix forthcoming. In GNU Emacs 24.4.51.5 (x86_64-unknown-linux-gnu, GTK+ Version 3.10.8) of 2014-12-11 on axl Repository revision: 0c2f254bc3d69ba08a59037e8e192d5d7fb7d816 Windowing system distributor `The X.Org Foundation', version 11.0.11501000 System Description: Ubuntu 14.04.1 LTS ------------=_1418655423-26398-1--