[PATCH] git.el: Add support for interactive diffs.
From: Alexandre Julliard <hidden>
Date: 2016-06-15 22:43:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Alexandre Julliard <redacted> --- contrib/emacs/git.el | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index f6102fc..214b75c 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el@@ -965,7 +965,13 @@ Return the list of files that haven't been handled." (defun git-diff-file-idiff () "Perform an interactive diff on the current file." (interactive) - (error "Interactive diffs not implemented yet.")) + (let ((files (git-marked-files-state 'added 'deleted 'modified))) + (unless (eq 1 (length files)) + (error "Cannot perform an interactive diff on multiple files.")) + (let* ((filename (car (git-get-filenames files))) + (buff1 (find-file-noselect filename)) + (buff2 (git-run-command-buffer (concat filename ".~HEAD~") "cat-file" "blob" (concat "HEAD:" filename)))) + (ediff-buffers buff1 buff2)))) (defun git-log-file () "Display a log of changes to the marked file(s)."
--
1.5.3.rc4.70.gf909
--
Alexandre Julliard
julliard@winehq.org