From: Glenn Morris <rgm@gnu.org>
To: 19099@debbugs.gnu.org
Subject: bug#19099: Diff options with vc-git
Date: Tue, 18 Nov 2014 14:09:53 -0500 [thread overview]
Message-ID: <mjoas4mike.fsf@fencepost.gnu.org> (raw)
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.
next reply other threads:[~2014-11-18 19:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-18 19:09 Glenn Morris [this message]
2014-11-18 19:17 ` bug#19099: Diff options with vc-git Eli Zaretskii
2014-11-18 19:27 ` Glenn Morris
2014-11-18 19:57 ` Eli Zaretskii
2014-11-18 20:01 ` Eli Zaretskii
2014-11-19 3:03 ` bug#19099: [PATCH] vc-git: Support `diff-switches' Rüdiger Sonderfeld
2014-11-19 4:36 ` Glenn Morris
2014-11-19 11:13 ` Rüdiger Sonderfeld
2014-11-19 18:30 ` Glenn Morris
2014-11-19 19:05 ` Eli Zaretskii
2014-11-19 19:44 ` Glenn Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=mjoas4mike.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=19099@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).