Commit 6ffab21f authored by Rüdiger Sonderfeld's avatar Rüdiger Sonderfeld
Browse files

vc-git: Support `diff-switches'.

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.
parent 6316435d
2014-11-19 Rüdiger Sonderfeld <ruediger@c-plusplus.net>
Fix bug#19099.
* vc/vc-git.el (vc-git-diff): Use "difftool -x diff" with
`diff-switches' if `vc-git-diff-switches' is nil.
2014-11-18 Juri Linkov <juri@linkov.net>
* simple.el (next-line-or-history-element): Wrap next-line
......
......@@ -994,11 +994,18 @@ or BRANCH^ (where \"^\" can be repeated)."
(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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment