branch: elpa/git-commit
commit 414c18c0f35e51ea98d1ae0504477e8e2063fd53
Author: Aaron L. Zeng <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-stash-save: Disable external diff tools
External diff tools may cause git to produce errors like
"unrecognized input" when the output is fed back into `git apply'.
Pass `--no-ext-diff' to `git diff' where necessary.
---
lisp/magit-stash.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index 9b8d3c3a65..8aee060a4c 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -317,7 +317,7 @@ current branch or `HEAD' as the start-point."
(magit-stash-create message index worktree
untracked))
(if (eq keep 'worktree)
(with-temp-buffer
- (magit-git-insert "diff" "--cached")
+ (magit-git-insert "diff" "--cached" "--no-ext-diff")
(magit-run-git-with-input
"apply" "--reverse" "--cached" "--ignore-space-change" "-")
(magit-run-git-with-input
