branch: elpa/magit
commit d6d1bcfeb72fa025049a0776a4303024fd359434
Author: Nikita Leshenko <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-commit-assert: Call magit-diff-unstaged with magit-diff-arguments
This is similar to how magit-diff-staged is called in this file.
Before this change, the final Git command will be called without
"--no-ext-diff", which results broken diffs when one has a custom
external diff program.
---
lisp/magit-commit.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index 94ce31de0a3..600c356dad4 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -379,7 +379,7 @@ depending on the value of option
`magit-commit-squash-confirm'."
(user-error "Nothing staged (or unstaged)"))
(magit-commit-ask-to-stage
(when (eq magit-commit-ask-to-stage 'verbose)
- (magit-diff-unstaged))
+ (apply #'magit-diff-unstaged (magit-diff-arguments)))
(prog1 (when (or (eq magit-commit-ask-to-stage 'stage)
(y-or-n-p
"Nothing staged. Commit all uncommitted changes? "))
