branch: elpa/magit
commit 8b59775f9fc76d8f4162bfd60bc6f7c944cdab5d
Author: Nikita Leshenko <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-stash-mode: Add "--no-ext-diff" to magit-diff-default-arguments
Before this change, stash display had broken diffs when one has a custom
external diff program.
---
lisp/magit-stash.el | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index cf1830acbcc..1a8779e9742 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -615,6 +615,9 @@ If there is no stash buffer in the same frame, then do
nothing."
(magit-hack-dir-local-variables)
(setq magit--imenu-group-types '(commit)))
+(put 'magit-stash-mode 'magit-diff-default-arguments
+ '("--no-ext-diff"))
+
(defun magit-stash-setup-buffer (stash args files)
(magit-setup-buffer #'magit-stash-mode nil
(magit-buffer-revision stash)
