From unknown Sun Jun 22 13:35:14 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#21457 <21457@debbugs.gnu.org> To: bug#21457 <21457@debbugs.gnu.org> Subject: Status: 25.0.50; vc-test-git03-working-revision test fails Reply-To: bug#21457 <21457@debbugs.gnu.org> Date: Sun, 22 Jun 2025 20:35:14 +0000 retitle 21457 25.0.50; vc-test-git03-working-revision test fails reassign 21457 emacs submitter 21457 Eli Zaretskii severity 21457 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 11 03:51:52 2015 Received: (at submit) by debbugs.gnu.org; 11 Sep 2015 07:51:52 +0000 Received: from localhost ([127.0.0.1]:56111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZaJ7f-0006h3-Ph for submit@debbugs.gnu.org; Fri, 11 Sep 2015 03:51:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34697) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZaJ7d-0006gv-T7 for submit@debbugs.gnu.org; Fri, 11 Sep 2015 03:51:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaJ7c-0000qH-1G for submit@debbugs.gnu.org; Fri, 11 Sep 2015 03:51:49 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:43662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaJ7b-0000qD-UB for submit@debbugs.gnu.org; Fri, 11 Sep 2015 03:51:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaJ7a-0001Uk-Iw for bug-gnu-emacs@gnu.org; Fri, 11 Sep 2015 03:51:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaJ7V-0000pH-G5 for bug-gnu-emacs@gnu.org; Fri, 11 Sep 2015 03:51:46 -0400 Received: from mtaout27.012.net.il ([80.179.55.183]:43554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaJ7V-0000nh-2k for bug-gnu-emacs@gnu.org; Fri, 11 Sep 2015 03:51:41 -0400 Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NUI0090056D8900@mtaout27.012.net.il> for bug-gnu-emacs@gnu.org; Fri, 11 Sep 2015 10:48:15 +0300 (IDT) Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUI000JH5OFGAA0@mtaout27.012.net.il> for bug-gnu-emacs@gnu.org; Fri, 11 Sep 2015 10:48:15 +0300 (IDT) Date: Fri, 11 Sep 2015 10:51:31 +0300 From: Eli Zaretskii Subject: 25.0.50; vc-test-git03-working-revision test fails X-012-Sender: halo1@inter.net.il To: bug-gnu-emacs@gnu.org Message-id: <83d1xp4cn0.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii 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: -5.0 (-----) This started lately, probably within the last couple of weeks. The error information in the log is: Test vc-test-git03-working-revision backtrace: vc-git-working-revision("c:/DOCUME~1/Zaretzky/LOCALS~1/Temp/vc-test4 apply(vc-git-working-revision "c:/DOCUME~1/Zaretzky/LOCALS~1/Temp/vc vc-call-backend(Git working-revision "c:/DOCUME~1/Zaretzky/LOCALS~1/ vc-working-revision("c:/DOCUME~1/Zaretzky/LOCALS~1/Temp/vc-test4572X vc-test--working-revision(Git) (lambda nil (let ((fn-90 (function ert-test-passed-p)) (args-91 (lis ert--run-test-internal([cl-struct-ert--test-execution-info [cl-struc ert-run-test([cl-struct-ert-test vc-test-git03-working-revision "Che ert-run-or-rerun-test([cl-struct-ert--stats t [[cl-struct-ert-test v ert-run-tests(t #[385 "\306^B\307\"\203G^@\211\211G\310U\203^T^@\211@\20 ert-run-tests-batch(nil) ert-run-tests-batch-and-exit() command-line-1(("-L" ";." "-l" "ert" "-l" "vc-tests.elc" "-f" "ert-r command-line() normal-top-level() Test vc-test-git03-working-revision condition: (args-out-of-range # 1 41) <<<<<<<<<<<<<<<<<<<<< FAILED 14/25 vc-test-git03-working-revision What does the marked line mean? What kind of error/problem should I look for? In GNU Emacs 25.0.50.411 (i686-pc-mingw32) of 2015-09-11 Repository revision: 8aa0386420f9d982b99568f27a5953dfc737640e Windowing system distributor 'Microsoft Corp.', version 5.1.2600 Configured using: 'configure --prefix=/d/usr --enable-checking=yes,glyphs --with-wide-int 'CFLAGS=-gdwarf-4 -g3 -O0'' Configured features: XPM JPEG TIFF GIF PNG RSVG SOUND NOTIFY ACL GNUTLS LIBXML2 ZLIB TOOLKIT_SCROLL_BARS Important settings: value of $LANG: ENU locale-coding-system: cp1255 Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent messages: For information about GNU Emacs and the GNU system, type C-h C-a. Load-path shadows: None found. Features: (shadow sort gnus-util mail-extr emacsbug message dired format-spec rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util help-fns help-mode easymenu cl-loaddefs pcase cl-lib mail-prsvr mail-utils time-date mule-util tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel dos-w32 ls-lisp disp-table w32-win w32-vars term/common-win tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment elisp-mode lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese charscript case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer cl-preloaded nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote w32notify w32 multi-tty make-network-process emacs) Memory information: ((conses 16 84952 6041) (symbols 56 19937 0) (miscs 48 37 86) (strings 16 15963 5898) (string-bytes 1 392849) (vectors 16 11218) (vector-slots 8 403214 4311) (floats 8 125 31) (intervals 40 260 63) (buffers 856 11)) From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 11 16:30:44 2015 Received: (at 21457) by debbugs.gnu.org; 11 Sep 2015 20:30:44 +0000 Received: from localhost ([127.0.0.1]:57334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZaUy3-0000Of-Sm for submit@debbugs.gnu.org; Fri, 11 Sep 2015 16:30:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59273) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZaUy0-0000OW-RM for 21457@debbugs.gnu.org; Fri, 11 Sep 2015 16:30:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaUxz-00040q-JE for 21457@debbugs.gnu.org; Fri, 11 Sep 2015 16:30:40 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaUxz-00040k-0G for 21457@debbugs.gnu.org; Fri, 11 Sep 2015 16:30:39 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1ZaUxw-0006Jx-PP; Fri, 11 Sep 2015 16:30:37 -0400 From: Glenn Morris To: Eli Zaretskii Subject: Re: bug#21457: 25.0.50; vc-test-git03-working-revision test fails References: <83d1xp4cn0.fsf@gnu.org> X-Spook: Norvo Virus Narcos UN Fusion Center Exon Shell bluebird X-Ran: }F\!+U{4bA_Uj*xZ(Lr'iBfoJfB.oNnr"$t}dJ\9+hO9'U#&R{u0_}5"p`S+6oFsCid2Ve X-Hue: green X-Attribution: GM Date: Fri, 11 Sep 2015 16:30:36 -0400 In-Reply-To: <83d1xp4cn0.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 11 Sep 2015 10:51:31 +0300") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 21457 Cc: 21457@debbugs.gnu.org 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: -5.0 (-----) Eli Zaretskii wrote: > (args-out-of-range # 1 41) <<<<<<<<<<<<<<<<<<<<< I guess this comes from vc-git--rev-parse. So I guess "git rev-parse WHATEVER" returns fewer than 40 characters for you. You could try looking it more details at what vc-git--rev-parse is doing. Perhaps it should use (min (point-max) (+ (point-min) 40)). From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 11 16:34:49 2015 Received: (at 21457) by debbugs.gnu.org; 11 Sep 2015 20:34:49 +0000 Received: from localhost ([127.0.0.1]:57357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZaV20-0000VN-So for submit@debbugs.gnu.org; Fri, 11 Sep 2015 16:34:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60212) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZaV1z-0000VG-Nh for 21457@debbugs.gnu.org; Fri, 11 Sep 2015 16:34:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaV1z-0005mA-2L for 21457@debbugs.gnu.org; Fri, 11 Sep 2015 16:34:47 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:48572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaV1y-0005m6-VW for 21457@debbugs.gnu.org; Fri, 11 Sep 2015 16:34:46 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1ZaV1y-0004Iv-1U; Fri, 11 Sep 2015 16:34:46 -0400 From: Glenn Morris To: Eli Zaretskii Subject: Re: bug#21457: 25.0.50; vc-test-git03-working-revision test fails References: <83d1xp4cn0.fsf@gnu.org> X-Spook: domestic disruption airframe 2600 Magazine Ft. Knox X-Ran: mJsr8n.q\&Uh)@)V;$EzQ:Wmm? (Glenn Morris's message of "Fri, 11 Sep 2015 16:30:36 -0400") Message-ID: <01lhcc3day.fsf@fencepost.gnu.org> User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 21457 Cc: 21457@debbugs.gnu.org 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: -5.0 (-----) Glenn Morris wrote: > Perhaps it should use (min (point-max) (+ (point-min) 40)). Scratch that, better to test for an actual hash, "[0-9a-f]\\{40\\}". From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 12 05:02:34 2015 Received: (at 21457) by debbugs.gnu.org; 12 Sep 2015 09:02:34 +0000 Received: from localhost ([127.0.0.1]:57608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zaghe-0003tV-8z for submit@debbugs.gnu.org; Sat, 12 Sep 2015 05:02:34 -0400 Received: from mtaout22.012.net.il ([80.179.55.172]:39463) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zaghb-0003tM-HE for 21457@debbugs.gnu.org; Sat, 12 Sep 2015 05:02:32 -0400 Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NUK000003P7IL00@a-mtaout22.012.net.il> for 21457@debbugs.gnu.org; Sat, 12 Sep 2015 12:02:29 +0300 (IDT) Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUK00M353S5W4B0@a-mtaout22.012.net.il>; Sat, 12 Sep 2015 12:02:29 +0300 (IDT) Date: Sat, 12 Sep 2015 12:02:24 +0300 From: Eli Zaretskii Subject: Re: bug#21457: 25.0.50; vc-test-git03-working-revision test fails In-reply-to: <01lhcc3day.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il To: Glenn Morris Message-id: <83mvws2eov.fsf@gnu.org> References: <83d1xp4cn0.fsf@gnu.org> <01lhcc3day.fsf@fencepost.gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 21457 Cc: 21457@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii 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: 1.0 (+) > From: Glenn Morris > Cc: 21457@debbugs.gnu.org > Date: Fri, 11 Sep 2015 16:34:45 -0400 > > Glenn Morris wrote: > > > Perhaps it should use (min (point-max) (+ (point-min) 40)). > > Scratch that, better to test for an actual hash, "[0-9a-f]\\{40\\}". But it doesn't return a hash in a repo that was just initted, it returns "HEAD". Try this: $ mkdir ttt $ cd ttt $ git init Initialized empty Git repository in D:/gnu/git/ttt/.git/ $ git rev-parse HEAD HEAD fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' $ echo $? 128 IOW, it returns "HEAD" and exits with an error status. Maybe the problem started when I upgraded Git to 2.5.1 lately. The patches below make this work for me. The first one should probably be applied regardless, as without it vc-git--rev-parse is not safe to call in some borderline cases. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 8a0f554..af2b39f 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1137,7 +1137,9 @@ (defun vc-git--rev-parse (rev) (with-temp-buffer (and (vc-git--out-ok "rev-parse" rev) - (buffer-substring-no-properties (point-min) (+ (point-min) 40))))) + (buffer-substring-no-properties (point-min) + (min (1- (point-max)) + (+ (point-min) 40)))))) (defun vc-git-next-revision (file rev) "Git-specific version of `vc-next-revision'." diff --git a/test/automated/vc-tests.el b/test/automated/vc-tests.el index a7242e9..3476846 100644 --- a/test/automated/vc-tests.el +++ b/test/automated/vc-tests.el @@ -367,12 +367,15 @@ (defun vc-test--working-revision (backend) ;; nil: CVS Mtn RCS SCCS ;; "0": Bzr Hg SRC SVN - ;; "master": Git + ;; "master" or "HEAD": Git + (message "%s: %s" + backend + (vc-working-revision default-directory backend)) (should (eq (vc-working-revision default-directory) (vc-working-revision default-directory backend))) (should (member - (vc-working-revision default-directory) '(nil "0" "master"))) + (vc-working-revision default-directory) '(nil "0" "master" "HEAD"))) (let ((tmp-name (expand-file-name "foo" default-directory))) ;; Check initial working revision, should be nil until @@ -380,22 +383,22 @@ (defun vc-test--working-revision (backend) ;; nil: CVS Mtn RCS SCCS SVN ;; "0": Bzr Hg SRC - ;; "master": Git + ;; "master" or "HEAD: Git (should (eq (vc-working-revision tmp-name) (vc-working-revision tmp-name backend))) (should - (member (vc-working-revision tmp-name) '(nil "0" "master"))) + (member (vc-working-revision tmp-name) '(nil "0" "master" "HEAD"))) ;; Write a new file. Check working revision. (write-region "foo" nil tmp-name nil 'nomessage) ;; nil: CVS Mtn RCS SCCS SVN ;; "0": Bzr Hg SRC - ;; "master": Git + ;; "master" or "HEAD": Git (should (eq (vc-working-revision tmp-name) (vc-working-revision tmp-name backend))) (should - (member (vc-working-revision tmp-name) '(nil "0" "master"))) + (member (vc-working-revision tmp-name) '(nil "0" "master" "HEAD"))) ;; Register a file. Check working revision. (vc-register @@ -403,11 +406,11 @@ (defun vc-test--working-revision (backend) ;; nil: Mtn RCS SCCS ;; "0": Bzr CVS Hg SRC SVN - ;; "master": Git + ;; "master" or "HEAD": Git (should (eq (vc-working-revision tmp-name) (vc-working-revision tmp-name backend))) (should - (member (vc-working-revision tmp-name) '(nil "0" "master"))) + (member (vc-working-revision tmp-name) '(nil "0" "master" "HEAD"))) ;; Unregister the file. Check working revision. (condition-case nil @@ -416,13 +419,13 @@ (defun vc-test--working-revision (backend) ;; nil: RCS ;; "0": Bzr Hg - ;; "master": Git + ;; "master" or "HEAD": Git ;; unsupported: CVS Mtn SCCS SRC SVN (should (eq (vc-working-revision tmp-name) (vc-working-revision tmp-name backend))) (should (member - (vc-working-revision tmp-name) '(nil "0" "master")))) + (vc-working-revision tmp-name) '(nil "0" "master" "HEAD")))) (vc-not-supported t)))) ;; Save exit. From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 12 05:43:06 2015 Received: (at 21457) by debbugs.gnu.org; 12 Sep 2015 09:43:06 +0000 Received: from localhost ([127.0.0.1]:57647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZahKr-0004oF-VP for submit@debbugs.gnu.org; Sat, 12 Sep 2015 05:43:06 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:58935) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZahKp-0004o4-F2 for 21457@debbugs.gnu.org; Sat, 12 Sep 2015 05:43:04 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3nCpsd50XVz3hj2Y; Sat, 12 Sep 2015 11:43:01 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3nCpsd3JVnzvkF3; Sat, 12 Sep 2015 11:43:01 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id mZBrinsXbNDn; Sat, 12 Sep 2015 11:43:00 +0200 (CEST) X-Auth-Info: zfGSXeXwDByNIE+/etEVxap6kffG/sC1l3X4kXXrlvxtvdj+lm2FAwq4hI5hr2i7 Received: from linux.local (host-188-174-203-113.customer.m-online.net [188.174.203.113]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 12 Sep 2015 11:43:00 +0200 (CEST) Received: by linux.local (Postfix, from userid 501) id B249A1E52FE; Sat, 12 Sep 2015 11:42:59 +0200 (CEST) From: Andreas Schwab To: Eli Zaretskii Subject: Re: bug#21457: 25.0.50; vc-test-git03-working-revision test fails References: <83d1xp4cn0.fsf@gnu.org> <01lhcc3day.fsf@fencepost.gnu.org> <83mvws2eov.fsf@gnu.org> X-Yow: UH-OH!! We're out of AUTOMOBILE PARTS and RUBBER GOODS! Date: Sat, 12 Sep 2015 11:42:59 +0200 In-Reply-To: <83mvws2eov.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 12 Sep 2015 12:02:24 +0300") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 21457 Cc: Glenn Morris , 21457@debbugs.gnu.org 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.7 (/) Eli Zaretskii writes: > The patches below make this work for me. The first one should > probably be applied regardless, as without it vc-git--rev-parse is not > safe to call in some borderline cases. > > diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el > index 8a0f554..af2b39f 100644 > --- a/lisp/vc/vc-git.el > +++ b/lisp/vc/vc-git.el > @@ -1137,7 +1137,9 @@ (defun vc-git--rev-parse (rev) > (with-temp-buffer > (and > (vc-git--out-ok "rev-parse" rev) > - (buffer-substring-no-properties (point-min) (+ (point-min) 40))))) > + (buffer-substring-no-properties (point-min) > + (min (1- (point-max)) > + (+ (point-min) 40)))))) Why does vc-git--out-ok return true when git rev-parse failed? Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 12 11:03:48 2015 Received: (at 21457) by debbugs.gnu.org; 12 Sep 2015 15:03:48 +0000 Received: from localhost ([127.0.0.1]:58479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZamLE-0005G7-5i for submit@debbugs.gnu.org; Sat, 12 Sep 2015 11:03:48 -0400 Received: from mtaout24.012.net.il ([80.179.55.180]:41710) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZamLB-0005Fx-Bi for 21457@debbugs.gnu.org; Sat, 12 Sep 2015 11:03:46 -0400 Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NUK00D00IY05600@mtaout24.012.net.il> for 21457@debbugs.gnu.org; Sat, 12 Sep 2015 17:56:11 +0300 (IDT) Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUK00DV9K5MK820@mtaout24.012.net.il>; Sat, 12 Sep 2015 17:56:11 +0300 (IDT) Date: Sat, 12 Sep 2015 18:03:38 +0300 From: Eli Zaretskii Subject: Re: bug#21457: 25.0.50; vc-test-git03-working-revision test fails In-reply-to: X-012-Sender: halo1@inter.net.il To: Andreas Schwab Message-id: <83h9mzbrxx.fsf@gnu.org> References: <83d1xp4cn0.fsf@gnu.org> <01lhcc3day.fsf@fencepost.gnu.org> <83mvws2eov.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 21457 Cc: rgm@gnu.org, 21457@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii 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: 1.0 (+) > From: Andreas Schwab > Cc: Glenn Morris , 21457@debbugs.gnu.org > Date: Sat, 12 Sep 2015 11:42:59 +0200 > > Eli Zaretskii writes: > > > The patches below make this work for me. The first one should > > probably be applied regardless, as without it vc-git--rev-parse is not > > safe to call in some borderline cases. > > > > diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el > > index 8a0f554..af2b39f 100644 > > --- a/lisp/vc/vc-git.el > > +++ b/lisp/vc/vc-git.el > > @@ -1137,7 +1137,9 @@ (defun vc-git--rev-parse (rev) > > (with-temp-buffer > > (and > > (vc-git--out-ok "rev-parse" rev) > > - (buffer-substring-no-properties (point-min) (+ (point-min) 40))))) > > + (buffer-substring-no-properties (point-min) > > + (min (1- (point-max)) > > + (+ (point-min) 40)))))) > > Why does vc-git--out-ok return true when git rev-parse failed? Good question, I will look into it soon. Do you know whether "HEAD" is indeed what the latest Git should return in this case, though? The original test expected "master". Was this some change in Git? I cannot find anything about this in Google, but that's a small wonder as including "HEAD" in the query brings in a lot of useless clutter. From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 12 11:36:51 2015 Received: (at 21457) by debbugs.gnu.org; 12 Sep 2015 15:36:51 +0000 Received: from localhost ([127.0.0.1]:58488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZamrC-0005z6-Jo for submit@debbugs.gnu.org; Sat, 12 Sep 2015 11:36:50 -0400 Received: from mtaout20.012.net.il ([80.179.55.166]:63068) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zamr9-0005yx-PN for 21457@debbugs.gnu.org; Sat, 12 Sep 2015 11:36:48 -0400 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NUK00F00LRF5700@a-mtaout20.012.net.il> for 21457@debbugs.gnu.org; Sat, 12 Sep 2015 18:36:46 +0300 (IDT) Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUK00EKLM1AUIB0@a-mtaout20.012.net.il>; Sat, 12 Sep 2015 18:36:46 +0300 (IDT) Date: Sat, 12 Sep 2015 18:36:41 +0300 From: Eli Zaretskii Subject: Re: bug#21457: 25.0.50; vc-test-git03-working-revision test fails In-reply-to: <83h9mzbrxx.fsf@gnu.org> X-012-Sender: halo1@inter.net.il To: schwab@linux-m68k.org Message-id: <83d1xnbqeu.fsf@gnu.org> References: <83d1xp4cn0.fsf@gnu.org> <01lhcc3day.fsf@fencepost.gnu.org> <83mvws2eov.fsf@gnu.org> <83h9mzbrxx.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 21457 Cc: 21457@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii 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: 1.0 (+) > Date: Sat, 12 Sep 2015 18:03:38 +0300 > From: Eli Zaretskii > Cc: 21457@debbugs.gnu.org > > > > diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el > > > index 8a0f554..af2b39f 100644 > > > --- a/lisp/vc/vc-git.el > > > +++ b/lisp/vc/vc-git.el > > > @@ -1137,7 +1137,9 @@ (defun vc-git--rev-parse (rev) > > > (with-temp-buffer > > > (and > > > (vc-git--out-ok "rev-parse" rev) > > > - (buffer-substring-no-properties (point-min) (+ (point-min) 40))))) > > > + (buffer-substring-no-properties (point-min) > > > + (min (1- (point-max)) > > > + (+ (point-min) 40)))))) > > > > Why does vc-git--out-ok return true when git rev-parse failed? > > Good question Answer: that's my local 'git' script, if I invoke the Git binary directly, the result is 128. But I still don't understand how this ;; Create empty repository. Check working revision of ;; repository, should be nil. (make-directory default-directory) (vc-test--create-repo-function backend) ;; nil: CVS Mtn RCS SCCS ;; "0": Bzr Hg SRC SVN ;; "master" or "HEAD": Git (should (eq (vc-working-revision default-directory) (vc-working-revision default-directory backend))) was supposed to work, since "git rev-parse HEAD" fails in an empty repository and returns just "HEAD", not a 40-digit hash or "master". What am I missing? From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 12 11:52:09 2015 Received: (at 21457) by debbugs.gnu.org; 12 Sep 2015 15:52:10 +0000 Received: from localhost ([127.0.0.1]:58492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zan61-0006Jd-Dy for submit@debbugs.gnu.org; Sat, 12 Sep 2015 11:52:09 -0400 Received: from mtaout21.012.net.il ([80.179.55.169]:59989) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zan5y-0006JU-OD for 21457@debbugs.gnu.org; Sat, 12 Sep 2015 11:52:07 -0400 Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NUK00A00MNMJN00@a-mtaout21.012.net.il> for 21457@debbugs.gnu.org; Sat, 12 Sep 2015 18:52:05 +0300 (IDT) Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUK00A4KMQSHW40@a-mtaout21.012.net.il>; Sat, 12 Sep 2015 18:52:05 +0300 (IDT) Date: Sat, 12 Sep 2015 18:52:00 +0300 From: Eli Zaretskii Subject: Re: bug#21457: 25.0.50; vc-test-git03-working-revision test fails In-reply-to: <83d1xnbqeu.fsf@gnu.org> X-012-Sender: halo1@inter.net.il To: schwab@linux-m68k.org Message-id: <83bnd7bppb.fsf@gnu.org> References: <83d1xp4cn0.fsf@gnu.org> <01lhcc3day.fsf@fencepost.gnu.org> <83mvws2eov.fsf@gnu.org> <83h9mzbrxx.fsf@gnu.org> <83d1xnbqeu.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 21457 Cc: 21457@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii 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: 1.0 (+) > Date: Sat, 12 Sep 2015 18:36:41 +0300 > From: Eli Zaretskii > Cc: 21457@debbugs.gnu.org > > But I still don't understand how this > > ;; Create empty repository. Check working revision of > ;; repository, should be nil. > (make-directory default-directory) > (vc-test--create-repo-function backend) > > ;; nil: CVS Mtn RCS SCCS > ;; "0": Bzr Hg SRC SVN > ;; "master" or "HEAD": Git > (should (eq (vc-working-revision default-directory) > (vc-working-revision default-directory backend))) > > was supposed to work, since "git rev-parse HEAD" fails in an empty > repository and returns just "HEAD", not a 40-digit hash or "master". Ah, okay, I get it: vc-working-revision was supposed to fail and return nil in both cases. Which makes this test not a very useful one. But then how was this supposed to work? ;; Register a file. Check working revision. (vc-register (list backend (list (file-name-nondirectory tmp-name)))) ;; nil: Mtn RCS SCCS ;; "0": Bzr CVS Hg SRC SVN ;; "master" or "HEAD": Git (should (eq (vc-working-revision tmp-name) (vc-working-revision tmp-name backend))) (should (member (vc-working-revision tmp-name) '(nil "0" "master"))) From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 12 12:54:36 2015 Received: (at 21457) by debbugs.gnu.org; 12 Sep 2015 16:54:36 +0000 Received: from localhost ([127.0.0.1]:58509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zao4S-0007hd-1O for submit@debbugs.gnu.org; Sat, 12 Sep 2015 12:54:36 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:40468) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zao4Q-0007hU-72 for 21457@debbugs.gnu.org; Sat, 12 Sep 2015 12:54:35 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3nD0RX3BB9z3hj1D; Sat, 12 Sep 2015 18:54:32 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3nD0RX1KF9zvdWt; Sat, 12 Sep 2015 18:54:32 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id sRcsBOafg8Pd; Sat, 12 Sep 2015 18:54:29 +0200 (CEST) X-Auth-Info: fPHxO7VUfb40IdF05RDziwY7diT9B2nkTBpOhv06eYiwWIeA7it2Ase09BFSNA5M Received: from igel.home (host-188-174-212-64.customer.m-online.net [188.174.212.64]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 12 Sep 2015 18:54:29 +0200 (CEST) Received: by igel.home (Postfix, from userid 1000) id 840FA2C24C1; Sat, 12 Sep 2015 18:54:29 +0200 (CEST) From: Andreas Schwab To: Eli Zaretskii Subject: Re: bug#21457: 25.0.50; vc-test-git03-working-revision test fails References: <83d1xp4cn0.fsf@gnu.org> <01lhcc3day.fsf@fencepost.gnu.org> <83mvws2eov.fsf@gnu.org> <83h9mzbrxx.fsf@gnu.org> X-Yow: Somewhere in DOWNTOWN BURBANK a prostitute is OVERCOOKING a LAMB CHOP!! Date: Sat, 12 Sep 2015 18:54:29 +0200 In-Reply-To: <83h9mzbrxx.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 12 Sep 2015 18:03:38 +0300") Message-ID: <87vbbf4lyy.fsf@igel.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 21457 Cc: 21457@debbugs.gnu.org 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.7 (/) Eli Zaretskii writes: > Do you know whether "HEAD" is indeed what the latest Git should return > in this case, though? Unrecognized arguments are printed unchanged. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 12 13:10:36 2015 Received: (at 21457-done) by debbugs.gnu.org; 12 Sep 2015 17:10:36 +0000 Received: from localhost ([127.0.0.1]:58518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZaoJw-00083x-Ar for submit@debbugs.gnu.org; Sat, 12 Sep 2015 13:10:36 -0400 Received: from mtaout26.012.net.il ([80.179.55.182]:38107) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZaoJt-00083n-9x for 21457-done@debbugs.gnu.org; Sat, 12 Sep 2015 13:10:35 -0400 Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NUK00O00Q5T2600@mtaout26.012.net.il> for 21457-done@debbugs.gnu.org; Sat, 12 Sep 2015 20:12:56 +0300 (IDT) Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NUK00K93QHKX540@mtaout26.012.net.il>; Sat, 12 Sep 2015 20:12:56 +0300 (IDT) Date: Sat, 12 Sep 2015 20:10:27 +0300 From: Eli Zaretskii Subject: Re: bug#21457: 25.0.50; vc-test-git03-working-revision test fails In-reply-to: <87vbbf4lyy.fsf@igel.home> X-012-Sender: halo1@inter.net.il To: Andreas Schwab Message-id: <83a8srbm2k.fsf@gnu.org> References: <83d1xp4cn0.fsf@gnu.org> <01lhcc3day.fsf@fencepost.gnu.org> <83mvws2eov.fsf@gnu.org> <83h9mzbrxx.fsf@gnu.org> <87vbbf4lyy.fsf@igel.home> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 21457-done Cc: 21457-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii 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: 1.0 (+) > From: Andreas Schwab > Cc: 21457@debbugs.gnu.org > Date: Sat, 12 Sep 2015 18:54:29 +0200 > > Eli Zaretskii writes: > > > Do you know whether "HEAD" is indeed what the latest Git should return > > in this case, though? > > Unrecognized arguments are printed unchanged. OK, I fixed my script, and vc-tests.el now passes without any changes. Sorry for wasting everybody's time. From unknown Sun Jun 22 13:35:14 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 11 Oct 2015 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator