From unknown Fri Aug 15 03:57:11 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#19099 <19099@debbugs.gnu.org> To: bug#19099 <19099@debbugs.gnu.org> Subject: Status: Diff options with vc-git Reply-To: bug#19099 <19099@debbugs.gnu.org> Date: Fri, 15 Aug 2025 10:57:11 +0000 retitle 19099 Diff options with vc-git reassign 19099 emacs submitter 19099 Glenn Morris severity 19099 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 18 14:09:56 2014 Received: (at submit) by debbugs.gnu.org; 18 Nov 2014 19:09:56 +0000 Received: from localhost ([127.0.0.1]:37505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xqo9z-0004t2-M5 for submit@debbugs.gnu.org; Tue, 18 Nov 2014 14:09:56 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:54223) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xqo9y-0004su-7k for submit@debbugs.gnu.org; Tue, 18 Nov 2014 14:09:54 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Xqo9x-0000zy-4O; Tue, 18 Nov 2014 14:09:53 -0500 From: Glenn Morris To: submit@debbugs.gnu.org Subject: Diff options with vc-git X-Spook: SEAL Team 6 UNSCOM Elvis jihad Rule Psix CESID Exon Shell X-Ran: @Xi2JZ$/DR31uoMrs]9PaXk|V6R}7dAR$r~!OH?Ju_&pL"/$dO;G)%5=/T[Q{u)=pQ User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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 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 (-----) Package: emacs Version: 24.4 I would like to use context diffs with vc-diff. Or pretend I said "any GNU diff option that git diff does not support". If I (setq diff-switches '("-c" -w")) then it works fine with vc-bzr, which correctly converts these into "--diff-options" for bzr diff. Same for vc-svn, which automatically adds --diff-cmd. With vc-git this does nothing. Setting vc-git-diff-switches to nil doesn't do the right thing: it passes -c to "git diff", which interprets it as "--combined", which is not what I wanted. IIUC there's basically no way to get this with git diff, I have to use difftool -x "diff -c" (which seems to parse its -x argument on whitespace, yuck). So, TLDR: I'd like an option to call difftool instead of diff in vc-git-diff, please. If it was consistent with eg vc-svn, this would happen by default when vc-git-diff-switches was nil. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 18 14:18:04 2014 Received: (at 19099) by debbugs.gnu.org; 18 Nov 2014 19:18:04 +0000 Received: from localhost ([127.0.0.1]:37516 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XqoHr-00056x-OL for submit@debbugs.gnu.org; Tue, 18 Nov 2014 14:18:04 -0500 Received: from mtaout20.012.net.il ([80.179.55.166]:44226) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XqoHo-00056T-R3 for 19099@debbugs.gnu.org; Tue, 18 Nov 2014 14:18:02 -0500 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NF900H001J5IR00@a-mtaout20.012.net.il> for 19099@debbugs.gnu.org; Tue, 18 Nov 2014 21:17:59 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF900HAR1LY2R70@a-mtaout20.012.net.il>; Tue, 18 Nov 2014 21:17:59 +0200 (IST) Date: Tue, 18 Nov 2014 21:17:53 +0200 From: Eli Zaretskii Subject: Re: bug#19099: Diff options with vc-git In-reply-to: X-012-Sender: halo1@inter.net.il To: Glenn Morris Message-id: <83389g9v32.fsf@gnu.org> References: X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 19099 Cc: 19099@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 > Date: Tue, 18 Nov 2014 14:09:53 -0500 > > IIUC there's basically no way to get this with git diff, I have to use > > difftool -x "diff -c" > > (which seems to parse its -x argument on whitespace, yuck). > > So, TLDR: > > I'd like an option to call difftool instead of diff in vc-git-diff, please. > If it was consistent with eg vc-svn, this would happen by default when > vc-git-diff-switches was nil. You can make an alias as described here: http://stackoverflow.com/questions/3129514/how-to-make-git-diff-create-a-context-format-diff and then invoke that alias instead of "diff". From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 18 14:27:26 2014 Received: (at 19099) by debbugs.gnu.org; 18 Nov 2014 19:27:26 +0000 Received: from localhost ([127.0.0.1]:37531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XqoQv-0005LT-O0 for submit@debbugs.gnu.org; Tue, 18 Nov 2014 14:27:26 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:54729) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XqoQt-0005LL-RU for 19099@debbugs.gnu.org; Tue, 18 Nov 2014 14:27:24 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XqoQt-0008FH-06; Tue, 18 Nov 2014 14:27:23 -0500 From: Glenn Morris To: Eli Zaretskii Subject: Re: bug#19099: Diff options with vc-git References: <83389g9v32.fsf@gnu.org> X-Spook: Iran FTS2000 Mena North Korea cybercash embassy ANDVT X-Ran: swZ_;@SJ.#Fn#2~hhHVD@zZ-UIx'Cls68"fa+y#M7S.-qsPChWkVu[YP!"]_(6^@~v1a~~ X-Hue: yellow X-Debbugs-No-Ack: yes X-Attribution: GM Date: Tue, 18 Nov 2014 14:27:22 -0500 In-Reply-To: <83389g9v32.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 18 Nov 2014 21:17:53 +0200") Message-ID: <3w1tp0nwbp.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 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 19099 Cc: 19099@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: > You can make an alias as described here: > > http://stackoverflow.com/questions/3129514/how-to-make-git-diff-create-a-context-format-diff > > and then invoke that alias instead of "diff". Git aliases cannot override built-in git commands. (By design, wontfix, etc.) So I cannot make "git diff" do what I want. If you think otherwise, please give me a concrete example of how I can configure Emacs to do what I want. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 18 14:58:09 2014 Received: (at 19099) by debbugs.gnu.org; 18 Nov 2014 19:58:09 +0000 Received: from localhost ([127.0.0.1]:37555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xqouf-00067w-8K for submit@debbugs.gnu.org; Tue, 18 Nov 2014 14:58:09 -0500 Received: from mtaout21.012.net.il ([80.179.55.169]:41171) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xqouc-00067k-6k for 19099@debbugs.gnu.org; Tue, 18 Nov 2014 14:58:07 -0500 Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NF900F0034V8F00@a-mtaout21.012.net.il> for 19099@debbugs.gnu.org; Tue, 18 Nov 2014 21:58:03 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF900F8C3GR3970@a-mtaout21.012.net.il>; Tue, 18 Nov 2014 21:58:03 +0200 (IST) Date: Tue, 18 Nov 2014 21:57:57 +0200 From: Eli Zaretskii Subject: Re: bug#19099: Diff options with vc-git In-reply-to: <3w1tp0nwbp.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il To: Glenn Morris Message-id: <83y4r88enu.fsf@gnu.org> References: <83389g9v32.fsf@gnu.org> <3w1tp0nwbp.fsf@fencepost.gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 19099 Cc: 19099@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: 19099@debbugs.gnu.org > Date: Tue, 18 Nov 2014 14:27:22 -0500 > > > and then invoke that alias instead of "diff". > > Git aliases cannot override built-in git commands. (By design, wontfix, etc.) > So I cannot make "git diff" do what I want. I said "alias +instead_ of diff", didn't I? > If you think otherwise, please give me a concrete example of how I can > configure Emacs to do what I want. Introduce a defcustom that will allow to all "git SOMETHING" when VC wants a diff command. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 18 15:01:36 2014 Received: (at 19099) by debbugs.gnu.org; 18 Nov 2014 20:01:36 +0000 Received: from localhost ([127.0.0.1]:37559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xqoy0-0006EF-0C for submit@debbugs.gnu.org; Tue, 18 Nov 2014 15:01:36 -0500 Received: from mtaout24.012.net.il ([80.179.55.180]:38740) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xqoxy-0006E6-4u for 19099@debbugs.gnu.org; Tue, 18 Nov 2014 15:01:34 -0500 Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NF900H00332O200@mtaout24.012.net.il> for 19099@debbugs.gnu.org; Tue, 18 Nov 2014 21:53:56 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF9007C439UZL90@mtaout24.012.net.il>; Tue, 18 Nov 2014 21:53:55 +0200 (IST) Date: Tue, 18 Nov 2014 22:01:25 +0200 From: Eli Zaretskii Subject: Re: bug#19099: Diff options with vc-git In-reply-to: <83y4r88enu.fsf@gnu.org> X-012-Sender: halo1@inter.net.il To: rgm@gnu.org Message-id: <83wq6s8ei2.fsf@gnu.org> References: <83389g9v32.fsf@gnu.org> <3w1tp0nwbp.fsf@fencepost.gnu.org> <83y4r88enu.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 19099 Cc: 19099@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: Tue, 18 Nov 2014 21:57:57 +0200 > From: Eli Zaretskii > Cc: 19099@debbugs.gnu.org > > Introduce a defcustom that will allow to all "git SOMETHING" when VC > wants a diff command. ^^^ I meant "call", of course. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 18 23:01:53 2014 Received: (at 19099) by debbugs.gnu.org; 19 Nov 2014 04:01:53 +0000 Received: from localhost ([127.0.0.1]:37725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XqwSm-0003ei-ES for submit@debbugs.gnu.org; Tue, 18 Nov 2014 23:01:53 -0500 Received: from ptmx.org ([178.63.28.110]:54145) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XqvYM-0002Eu-PD for 19099@debbugs.gnu.org; Tue, 18 Nov 2014 22:03:35 -0500 Received: from localhost (localhost [127.0.0.1]) by ptmx.org (Postfix) with ESMTP id CA7AE2CA17; Wed, 19 Nov 2014 04:03:32 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ptmx.org Received: from ptmx.org ([127.0.0.1]) by localhost (ptmx.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4DDF030j7g02; Wed, 19 Nov 2014 04:03:30 +0100 (CET) Received: from descartes.localnet (chello080109100138.16.15.univie.teleweb.at [80.109.100.138]) by ptmx.org (Postfix) with ESMTPSA id B20922855C; Wed, 19 Nov 2014 04:03:30 +0100 (CET) From: =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld To: 19099@debbugs.gnu.org Subject: [PATCH] vc-git: Support `diff-switches'. Date: Wed, 19 Nov 2014 04:03:17 +0100 Message-ID: <2391043.JvtrDuf8fR@descartes> User-Agent: KMail/4.13.3 (Linux/3.13.0-39-generic; KDE/4.13.3; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 19099 X-Mailman-Approved-At: Tue, 18 Nov 2014 23:01:51 -0500 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.0 (/) This patch should add support for it. Please check if it works for you. ChangeLog: Fix bug#19099. * lisp/vc/vc-git.el (vc-git-diff): Use "difftool -x diff" with `diff-switches' if `vc-git-diff-switches' is nil. --- lisp/vc/vc-git.el | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index be0211c..3b11a3c 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -994,11 +994,18 @@ (autoload 'vc-switches "vc") (defun vc-git-diff (files &optional rev1 rev2 buffer) "Get a difference report using Git between two revisions of FILES." (let (process-file-side-effects) - (apply #'vc-git-command (or buffer "*vc-diff*") 1 files - (if (and rev1 rev2) "diff-tree" "diff-index") - "--exit-code" - (append (vc-switches 'git 'diff) - (list "-p" (or rev1 "HEAD") rev2 "--"))))) + (if vc-git-diff-switches + (apply #'vc-git-command (or buffer "*vc-diff*") 1 files + (if (and rev1 rev2) "diff-tree" "diff-index") + "--exit-code" + (append (vc-switches 'git 'diff) + (list "-p" (or rev1 "HEAD") rev2 "--"))) + (vc-git-command (or buffer "*vc-diff*") 1 files + "difftool" "--exit-code" "--no-prompt" "-x" + (concat "diff " + (mapconcat 'identity + (vc-switches nil 'diff) " ")) + (or rev1 "HEAD") rev2 "--")))) (defun vc-git-revision-table (_files) ;; What about `files'?!? --Stef -- 2.1.3 From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 18 23:36:14 2014 Received: (at 19099) by debbugs.gnu.org; 19 Nov 2014 04:36:14 +0000 Received: from localhost ([127.0.0.1]:37732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xqx02-0004Ul-22 for submit@debbugs.gnu.org; Tue, 18 Nov 2014 23:36:14 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:36602) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xqx00-0004Uc-IZ for 19099@debbugs.gnu.org; Tue, 18 Nov 2014 23:36:12 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Xqwzz-0004EV-F4; Tue, 18 Nov 2014 23:36:11 -0500 From: Glenn Morris To: =?utf-8?Q?R=C3=BCdiger?= Sonderfeld Subject: Re: bug#19099: [PATCH] vc-git: Support `diff-switches'. References: <2391043.JvtrDuf8fR@descartes> X-Spook: Freeh Taiwan JSOFC3IP clandestine Capricorn IMF codes X-Ran: {fOjgI(T>*e=zyCmdp`*^rKutaw^VpK:4Eg>".X7$*vnBH@}lIqzvA-|R-ow\!#PBE`(J( X-Hue: white X-Debbugs-No-Ack: yes X-Attribution: GM Date: Tue, 18 Nov 2014 23:36:11 -0500 In-Reply-To: <2391043.JvtrDuf8fR@descartes> (=?utf-8?Q?=22R=C3=BCdiger?= Sonderfeld"'s message of "Wed, 19 Nov 2014 04:03:17 +0100") Message-ID: <2fegszbydg.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 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 19099 Cc: 19099@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 (-----) Thanks, works for me, and seems to neatly avoid being an incompatible change wrt vc-git-diff-switches being non-nil and non-t. BTW, I appreciate how you often try to improve git-related things. From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 19 06:13:40 2014 Received: (at 19099-done) by debbugs.gnu.org; 19 Nov 2014 11:13:40 +0000 Received: from localhost ([127.0.0.1]:37867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xr3Cd-0007CC-SJ for submit@debbugs.gnu.org; Wed, 19 Nov 2014 06:13:40 -0500 Received: from ptmx.org ([178.63.28.110]:60481) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xr3Cc-0007C4-A4 for 19099-done@debbugs.gnu.org; Wed, 19 Nov 2014 06:13:38 -0500 Received: from localhost (localhost [127.0.0.1]) by ptmx.org (Postfix) with ESMTP id 8C83D2CA2D; Wed, 19 Nov 2014 12:13:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ptmx.org Received: from ptmx.org ([127.0.0.1]) by localhost (ptmx.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id skdWUIoiD5s6; Wed, 19 Nov 2014 12:13:34 +0100 (CET) Received: from descartes.localnet (chello080109100138.16.15.univie.teleweb.at [80.109.100.138]) by ptmx.org (Postfix) with ESMTPSA id 8A1BF2855C; Wed, 19 Nov 2014 12:13:34 +0100 (CET) From: =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld To: Glenn Morris Subject: Re: bug#19099: [PATCH] vc-git: Support `diff-switches'. Date: Wed, 19 Nov 2014 12:13:14 +0100 Message-ID: <2470156.D7hOU3eUPs@descartes> User-Agent: KMail/4.13.3 (Linux/3.13.0-39-generic; KDE/4.13.3; x86_64; ; ) In-Reply-To: <2fegszbydg.fsf@fencepost.gnu.org> References: <2391043.JvtrDuf8fR@descartes> <2fegszbydg.fsf@fencepost.gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 19099-done Cc: 19099-done@debbugs.gnu.org, =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld 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.0 (/) tags 19099 fixed On Tuesday 18 November 2014 23:36:11 Glenn Morris wrote: > Thanks, works for me, and seems to neatly avoid being an incompatible= > change wrt vc-git-diff-switches being non-nil and non-t. I've pushed it to master. > BTW, I appreciate how you often try to improve git-related things. Thanks! Regards, R=C3=BCdiger From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 19 13:30:16 2014 Received: (at 19099) by debbugs.gnu.org; 19 Nov 2014 18:30:16 +0000 Received: from localhost ([127.0.0.1]:38583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XrA19-0006gc-O0 for submit@debbugs.gnu.org; Wed, 19 Nov 2014 13:30:16 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:55809) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XrA18-0006gV-CH for 19099@debbugs.gnu.org; Wed, 19 Nov 2014 13:30:14 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XrA17-0006uK-M2; Wed, 19 Nov 2014 13:30:13 -0500 From: Glenn Morris To: =?utf-8?Q?R=C3=BCdiger?= Sonderfeld Subject: Re: bug#19099: [PATCH] vc-git: Support `diff-switches'. References: <2391043.JvtrDuf8fR@descartes> <2fegszbydg.fsf@fencepost.gnu.org> <2470156.D7hOU3eUPs@descartes> X-Spook: Aladdin Blowfish Ft. Bragg kilderkin Plame CDC sniper X-Ran: I.j7GTnyynI%2!|z88"P@>*;7+^Uf\1,aKs-"Cc/gZI7gsMAErgMKrM*<[usgViDcH75dp X-Hue: blue X-Debbugs-No-Ack: yes X-Attribution: GM Date: Wed, 19 Nov 2014 13:30:13 -0500 In-Reply-To: <2470156.D7hOU3eUPs@descartes> (=?utf-8?Q?=22R=C3=BCdiger?= Sonderfeld"'s message of "Wed, 19 Nov 2014 12:13:14 +0100") 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 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 19099 Cc: 19099@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 (-----) Thanks. FWIW, you used a non-standard markup in the ChangeLog and commit log: "Fix bug#19099" rather than "(Bug#19099)" and "Fixes: debbugs:19099". (Ties back in to http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01024.html ) From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 19 14:05:41 2014 Received: (at 19099) by debbugs.gnu.org; 19 Nov 2014 19:05:41 +0000 Received: from localhost ([127.0.0.1]:38620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XrAZQ-0007ZO-E8 for submit@debbugs.gnu.org; Wed, 19 Nov 2014 14:05:41 -0500 Received: from mtaout25.012.net.il ([80.179.55.181]:58511) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XrAZN-0007ZD-NF for 19099@debbugs.gnu.org; Wed, 19 Nov 2014 14:05:38 -0500 Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NFA00L00VABGZ00@mtaout25.012.net.il> for 19099@debbugs.gnu.org; Wed, 19 Nov 2014 21:01:13 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFA00EVRVI12H60@mtaout25.012.net.il>; Wed, 19 Nov 2014 21:01:13 +0200 (IST) Date: Wed, 19 Nov 2014 21:05:33 +0200 From: Eli Zaretskii Subject: Re: bug#19099: [PATCH] vc-git: Support `diff-switches'. In-reply-to: X-012-Sender: halo1@inter.net.il To: Glenn Morris Message-id: <83ppcj6mf6.fsf@gnu.org> References: <2391043.JvtrDuf8fR@descartes> <2fegszbydg.fsf@fencepost.gnu.org> <2470156.D7hOU3eUPs@descartes> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 19099 Cc: ruediger@c-plusplus.de, 19099@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 > Date: Wed, 19 Nov 2014 13:30:13 -0500 > Cc: 19099@debbugs.gnu.org > > FWIW, you used a non-standard markup in the ChangeLog and commit log: > "Fix bug#19099" rather than "(Bug#19099)" and "Fixes: debbugs:19099". I didn't understand the "Fixes: debbugs:19099" part was a decision. It sounded like some discussion with no conclusion. From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 19 14:44:33 2014 Received: (at 19099) by debbugs.gnu.org; 19 Nov 2014 19:44:33 +0000 Received: from localhost ([127.0.0.1]:38667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XrBB2-0001Up-Ue for submit@debbugs.gnu.org; Wed, 19 Nov 2014 14:44:33 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:57470) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XrBB0-0001Ud-9a for 19099@debbugs.gnu.org; Wed, 19 Nov 2014 14:44:30 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XrBAz-0005RW-BW; Wed, 19 Nov 2014 14:44:29 -0500 From: Glenn Morris To: Eli Zaretskii Subject: Re: bug#19099: [PATCH] vc-git: Support `diff-switches'. References: <2391043.JvtrDuf8fR@descartes> <2fegszbydg.fsf@fencepost.gnu.org> <2470156.D7hOU3eUPs@descartes> <83ppcj6mf6.fsf@gnu.org> X-Spook: Kh-11 Merlin cracking Security Council South Africa Telex X-Ran: g7)-.b@GOHr@E&z!"PRf*"C:Z[Wi#(4_??nQPCzg?$?s]?$&04Kv9pwi{/Z\~*yGT*A| (Eli Zaretskii's message of "Wed, 19 Nov 2014 21:05:33 +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 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 19099 Cc: ruediger@c-plusplus.de, 19099@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: >> FWIW, you used a non-standard markup in the ChangeLog and commit log: >> "Fix bug#19099" rather than "(Bug#19099)" and "Fixes: debbugs:19099". > > I didn't understand the "Fixes: debbugs:19099" part was a decision. > It sounded like some discussion with no conclusion. I agree with both your points. The standard practice for ChangeLogs is not really in doubt, IMO (modulo minor cosmetic details). I'd really like there to be a standard for both, so I hope you push through with that discussion and get it to a conclusion. I don't really care what the standard is, so much as there is one. I don't think I have the enthusiasm to help get it done right now. From unknown Fri Aug 15 03:57:11 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 18 Dec 2014 12: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