From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#19099: Diff options with vc-git Date: Tue, 18 Nov 2014 14:09:53 -0500 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1416337821 7319 80.91.229.3 (18 Nov 2014 19:10:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 19:10:21 +0000 (UTC) To: 19099@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Nov 18 20:10:12 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XqoAG-0002ad-0q for geb-bug-gnu-emacs@m.gmane.org; Tue, 18 Nov 2014 20:10:12 +0100 Original-Received: from localhost ([::1]:54835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqoAF-0002MI-4K for geb-bug-gnu-emacs@m.gmane.org; Tue, 18 Nov 2014 14:10:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqoA8-0002Ip-Pu for bug-gnu-emacs@gnu.org; Tue, 18 Nov 2014 14:10:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqoA7-0001bG-UK for bug-gnu-emacs@gnu.org; Tue, 18 Nov 2014 14:10:04 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:40292) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqoA7-0001ap-Qb for bug-gnu-emacs@gnu.org; Tue, 18 Nov 2014 14:10:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XqoA7-0004tY-5J for bug-gnu-emacs@gnu.org; Tue, 18 Nov 2014 14:10:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 18 Nov 2014 19:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19099 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: submit@debbugs.gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.141633779618792 (code B ref -1); Tue, 18 Nov 2014 19:10:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 18 Nov 2014 19:09:56 +0000 Original-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 Original-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 Original-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 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:96203 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.