From unknown Fri Aug 08 19:52:23 2025 X-Loop: don@donarmstrong.com Subject: bug#1386: 23.0.60; vc-git-diff: diff switches can't be customized Reply-To: Magnus Henoch , 1386-quiet@debbugs.gnu.org Resent-From: Magnus Henoch Original-Sender: Glenn Morris Resent-To: Resent-Date: Thu, 20 Nov 2008 01:00:03 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 1386 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by quiet@emacsbugs.donarmstrong.com id=Q.122714240516036 (code Q ref -1); Thu, 20 Nov 2008 01:00:03 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-8.0 required=4.0 tests=AWL,BAYES_00, RCVD_IN_DNSWL_MED,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at quiet) by emacsbugs.donarmstrong.com; 20 Nov 2008 00:53:25 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mAK0rM7i016028 for ; Wed, 19 Nov 2008 16:53:23 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1L2xnE-0003PS-DH for quiet@emacsbugs.donarmstrong.com; Wed, 19 Nov 2008 19:53:12 -0500 From: Magnus Henoch To: quiet@debbugs.gnu.org Date: Sun, 01 Jun 2008 16:12:46 +0200 Lines: 106 X-From-Line: emacs-devel-bounces+rgm=gnu.org@gnu.org Sun Jun 1 10:11:55 2008 Received: from mx10.gnu.org ([199.232.76.166]:38659) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1K2oHr-0007oP-Gr for rgm@gnu.org; Sun, 01 Jun 2008 10:11:55 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1K2oJT-0005lw-Pm for rgm@gnu.org; Sun, 01 Jun 2008 10:13:44 -0400 Received: from lists.gnu.org ([199.232.76.165]:60360) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1K2oJT-0005ls-J9 for rgm@gnu.org; Sun, 01 Jun 2008 10:13:35 -0400 Received: from localhost ([127.0.0.1]:47481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1K2oJT-0005BQ-GQ for rgm@gnu.org; Sun, 01 Jun 2008 10:13:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1K2oIs-00058H-Vi for emacs-devel@gnu.org; Sun, 01 Jun 2008 10:12:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1K2oIs-00056q-8Y for emacs-devel@gnu.org; Sun, 01 Jun 2008 10:12:58 -0400 Received: from [199.232.76.173] (port=43480 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1K2oIs-00056c-4d for emacs-devel@gnu.org; Sun, 01 Jun 2008 10:12:58 -0400 Received: from fencepost.gnu.org ([140.186.70.10]:56310) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1K2oIr-0005e0-SP for emacs-devel@gnu.org; Sun, 01 Jun 2008 10:12:57 -0400 Received: from mx10.gnu.org ([199.232.76.166]:38595) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1K2oH6-0007nK-L0 for emacs-pretest-bug@gnu.org; Sun, 01 Jun 2008 10:11:08 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1K2oIm-0005cN-IP for emacs-pretest-bug@gnu.org; Sun, 01 Jun 2008 10:12:57 -0400 Received: from atum.ita.chalmers.se ([129.16.4.148]:59135) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1K2oIm-0005bp-1O for emacs-pretest-bug@gnu.org; Sun, 01 Jun 2008 10:12:52 -0400 Received: from zemdatav.stor.no-ip.org (persephone.tekno.chalmers.se [129.16.30.195]) by mail.chalmers.se (Postfix) with ESMTP id 08BC08871 for ; Sun, 1 Jun 2008 16:12:49 +0200 (CEST) Received: by zemdatav.stor.no-ip.org (Postfix, from userid 1000) id D0D0E43E75; Sun, 1 Jun 2008 16:12:47 +0200 (CEST) X-Hashcash: 1:23:080601:emacs-pretest-bug@gnu.org::FuOx5kcOLXXDqsiX:000000000000000000000000000000000001XpYw X-detected-kernel: by monty-python.gnu.org: Solaris 10 (beta) X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+rgm=gnu.org@gnu.org X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: Glenn Morris [ edited resend from http://lists.gnu.org/archive/html/emacs-devel/2008-06/msg00018.html ] Please describe exactly what actions triggered the bug and the precise symptoms of the bug: I opened etc/spook.lines in the Emacs Git tree, typed C-x v l, put point on one revision and typed d to see the diff. The result was just: Binary files a/etc/spook.lines and b/etc/spook.lines differ I then added "-a" to vc-diff-switches, but this had no effect. I then found that vc-git-diff doesn't obey _any_ of diff-switches, vc-diff-switches and vc-git-diff-switches, though the docstring of vc-diff-switches implies that it would. In GNU Emacs 23.0.60.1 (powerpc-unknown-netbsd4.99.42, X toolkit, Xaw3d scroll bars) of 2008-05-29 on zemdatav Windowing system distributor `The X.Org Foundation', version 11.0.10300000 configured using `configure '--with-x-toolkit=athena' '--enable-maintainer-mod' '--without-rsvg'' From unknown Fri Aug 08 19:52:23 2025 X-Loop: don@donarmstrong.com Subject: bug#1386: 23.0.60; vc-git-diff: diff switches can't be customized Reply-To: Glenn Morris , 1386@debbugs.gnu.org Resent-From: Glenn Morris Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Fri, 21 Nov 2008 19:45:02 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 1386 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by 1386-submit@emacsbugs.donarmstrong.com id=B1386.122729628615750 (code B ref 1386); Fri, 21 Nov 2008 19:45:02 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-12.3 required=4.0 tests=AWL,BAYES_00,FOURLA, HAS_BUG_NUMBER,MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 1386) by emacsbugs.donarmstrong.com; 21 Nov 2008 19:38:06 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mALJc3mm015736 for <1386@emacsbugs.donarmstrong.com>; Fri, 21 Nov 2008 11:38:04 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1L3bp8-00086v-MF; Fri, 21 Nov 2008 14:37:50 -0500 From: Glenn Morris To: Magnus Henoch Cc: 1386@debbugs.gnu.org References: X-Spook: Zachawi Defcon undercover Leitrim Jyllandsposten X-Ran: J3xFr0qWQXp'PJ*w=;-Y0:LYoDZ1@9q}=DyIg-U2w'"]qi(r#n6({3zvzF6=ylpHvoO,-| X-Hue: cyan X-Attribution: GM Date: Fri, 21 Nov 2008 14:37:50 -0500 In-Reply-To: (Magnus Henoch's message of "Sun, 01 Jun 2008 16:12:46 +0200") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Magnus Henoch wrote: > I then found that vc-git-diff doesn't obey _any_ of diff-switches, > vc-diff-switches and vc-git-diff-switches, though the docstring of > vc-diff-switches implies that it would. Sorry for the long delay. Please try this patch. *** vc-git.el 27 Oct 2008 07:21:47 -0000 1.74 --- vc-git.el 21 Nov 2008 19:32:55 -0000 *************** *** 109,114 **** --- 109,127 ---- (require 'vc-dir) (require 'grep)) + (defcustom vc-git-diff-switches t + "String or list of strings specifying extra switches for Git diff under VC. + If nil, use the value of `vc-diff-switches'. + If you want to force an empty list of arguments, use t." + :type '(choice (const :tag "Unspecified" nil) + (const :tag "None" t) + (string :tag "Argument String") + (repeat :tag "Argument List" + :value ("") + string)) + :version "23.1" + :group 'vc) + (defvar git-commits-coding-system 'utf-8 "Default coding system for git commits.") *************** *** 501,512 **** (beginning-of-line)) (defun vc-git-diff (files &optional rev1 rev2 buffer) ! (let ((buf (or buffer "*vc-diff*"))) ! (if (and rev1 rev2) ! (vc-git-command buf 1 files "diff-tree" "--exit-code" "-p" ! rev1 rev2 "--") ! (vc-git-command buf 1 files "diff-index" "--exit-code" "-p" ! (or rev1 "HEAD") "--")))) (defun vc-git-revision-table (files) ;; What about `files'?!? --Stef --- 514,525 ---- (beginning-of-line)) (defun vc-git-diff (files &optional rev1 rev2 buffer) ! "Get a difference report using Git between two revisions of FILES." ! (apply #'vc-git-command (or buffer "*vc-diff*") 1 files ! (if (and rev1 rev2) "diff-tree" "diff-index") ! "--exit-code" ! (append (vc-switches (if vc-git-diff-switches 'git) 'diff) ! (list "-p" (or rev1 "HEAD") rev2 "--")))) (defun vc-git-revision-table (files) ;; What about `files'?!? --Stef From unknown Fri Aug 08 19:52:23 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.420 (Entity 5.420) X-Loop: don@donarmstrong.com From: help-debbugs@gnu.org (Emacs bug Tracking System) To: Magnus Henoch Subject: bug#1386 closed by Glenn Morris (Re: bug#1386: 23.0.60; vc-git-diff: diff switches can't be customized) Message-ID: References: <4k5archza.fsf@fencepost.gnu.org> X-Emacs-PR-Message: they-closed 1386 X-Emacs-PR-Package: emacs Reply-To: 1386@debbugs.gnu.org Content-Type: multipart/mixed; boundary="----------=_1227668705-30983-1" This is a multi-part message in MIME format... ------------=_1227668705-30983-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is an automatic notification regarding your bug report which was filed against the emacs package: #1386: 23.0.60; vc-git-diff: diff switches can't be customized It has been closed by Glenn Morris . Their explanation is attached below along with your original report. If this explanation is unsatisfactory and you have not received a better one in a separate message then please contact Glenn Morris by replying to this email. --=20 1386: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D1386 Emacs Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1227668705-30983-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit >From rgm@gnu.org Tue Nov 25 18:57:18 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-12.4 required=4.0 tests=AWL,BAYES_00,HAS_BUG_NUMBER, RCVD_IN_DNSWL_MED,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at 1386-done) by emacsbugs.donarmstrong.com; 26 Nov 2008 02:57:18 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mAQ2vFq6029315 for <1386-done@emacsbugs.donarmstrong.com>; Tue, 25 Nov 2008 18:57:16 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1L5AaH-0001Zl-MJ; Tue, 25 Nov 2008 21:56:57 -0500 From: Glenn Morris To: 1386-done@debbugs.gnu.org Subject: Re: bug#1386: 23.0.60; vc-git-diff: diff switches can't be customized References: X-Spook: Baranyi counter terrorism arrangements jihad Honduras X-Ran: 8x)OJubqyED9*Pdx5F[$cp~)1PPhAEV"1*?p'JF!"-:-0aoS,ljNBvM?I"B?_9cQJ<|'c( X-Hue: cyan X-Debbugs-No-Ack: yes X-Attribution: GM Date: Tue, 25 Nov 2008 21:56:57 -0500 In-Reply-To: (Glenn Morris's message of "Fri, 21 Nov 2008 14:37:50 -0500") Message-ID: <4k5archza.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; charset=us-ascii 2008-11-26 Glenn Morris * vc-git.el (vc-git-diff-switches): New option. (vc-git-diff): Apply diff switches. (Bug#1386) ------------=_1227668705-30983-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit >From rgm@gnu.org Wed Nov 19 16:53:25 2008 X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02 (2007-08-08) on rzlab.ucr.edu X-Spam-Level: X-Spam-Status: No, score=-8.0 required=4.0 tests=AWL,BAYES_00, RCVD_IN_DNSWL_MED,X_DEBBUGS_NO_ACK autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02 Received: (at quiet) by emacsbugs.donarmstrong.com; 20 Nov 2008 00:53:25 +0000 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mAK0rM7i016028 for ; Wed, 19 Nov 2008 16:53:23 -0800 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1L2xnE-0003PS-DH for quiet@emacsbugs.donarmstrong.com; Wed, 19 Nov 2008 19:53:12 -0500 From: Magnus Henoch To: quiet@debbugs.gnu.org Subject: 23.0.60; vc-git-diff: diff switches can't be customized Date: Sun, 01 Jun 2008 16:12:46 +0200 Lines: 106 X-From-Line: emacs-devel-bounces+rgm=gnu.org@gnu.org Sun Jun 1 10:11:55 2008 Received: from mx10.gnu.org ([199.232.76.166]:38659) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1K2oHr-0007oP-Gr for rgm@gnu.org; Sun, 01 Jun 2008 10:11:55 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1K2oJT-0005lw-Pm for rgm@gnu.org; Sun, 01 Jun 2008 10:13:44 -0400 Received: from lists.gnu.org ([199.232.76.165]:60360) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1K2oJT-0005ls-J9 for rgm@gnu.org; Sun, 01 Jun 2008 10:13:35 -0400 Received: from localhost ([127.0.0.1]:47481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1K2oJT-0005BQ-GQ for rgm@gnu.org; Sun, 01 Jun 2008 10:13:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1K2oIs-00058H-Vi for emacs-devel@gnu.org; Sun, 01 Jun 2008 10:12:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1K2oIs-00056q-8Y for emacs-devel@gnu.org; Sun, 01 Jun 2008 10:12:58 -0400 Received: from [199.232.76.173] (port=43480 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1K2oIs-00056c-4d for emacs-devel@gnu.org; Sun, 01 Jun 2008 10:12:58 -0400 Received: from fencepost.gnu.org ([140.186.70.10]:56310) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1K2oIr-0005e0-SP for emacs-devel@gnu.org; Sun, 01 Jun 2008 10:12:57 -0400 Received: from mx10.gnu.org ([199.232.76.166]:38595) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1K2oH6-0007nK-L0 for emacs-pretest-bug@gnu.org; Sun, 01 Jun 2008 10:11:08 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1K2oIm-0005cN-IP for emacs-pretest-bug@gnu.org; Sun, 01 Jun 2008 10:12:57 -0400 Received: from atum.ita.chalmers.se ([129.16.4.148]:59135) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1K2oIm-0005bp-1O for emacs-pretest-bug@gnu.org; Sun, 01 Jun 2008 10:12:52 -0400 Received: from zemdatav.stor.no-ip.org (persephone.tekno.chalmers.se [129.16.30.195]) by mail.chalmers.se (Postfix) with ESMTP id 08BC08871 for ; Sun, 1 Jun 2008 16:12:49 +0200 (CEST) Received: by zemdatav.stor.no-ip.org (Postfix, from userid 1000) id D0D0E43E75; Sun, 1 Jun 2008 16:12:47 +0200 (CEST) X-Hashcash: 1:23:080601:emacs-pretest-bug@gnu.org::FuOx5kcOLXXDqsiX:000000000000000000000000000000000001XpYw X-detected-kernel: by monty-python.gnu.org: Solaris 10 (beta) X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-Debbugs-No-Ack: yes X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+rgm=gnu.org@gnu.org X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: Glenn Morris [ edited resend from http://lists.gnu.org/archive/html/emacs-devel/2008-06/msg00018.html ] Please describe exactly what actions triggered the bug and the precise symptoms of the bug: I opened etc/spook.lines in the Emacs Git tree, typed C-x v l, put point on one revision and typed d to see the diff. The result was just: Binary files a/etc/spook.lines and b/etc/spook.lines differ I then added "-a" to vc-diff-switches, but this had no effect. I then found that vc-git-diff doesn't obey _any_ of diff-switches, vc-diff-switches and vc-git-diff-switches, though the docstring of vc-diff-switches implies that it would. In GNU Emacs 23.0.60.1 (powerpc-unknown-netbsd4.99.42, X toolkit, Xaw3d scroll bars) of 2008-05-29 on zemdatav Windowing system distributor `The X.Org Foundation', version 11.0.10300000 configured using `configure '--with-x-toolkit=athena' '--enable-maintainer-mod' '--without-rsvg'' ------------=_1227668705-30983-1--