diff options
| author | Nikita Leshenko <nikita@leshenko.net> | 2025-01-08 13:33:49 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2025-01-09 19:47:32 +0100 |
| commit | d6d1bcfeb72fa025049a0776a4303024fd359434 (patch) | |
| tree | ae3b7c0079dd4d995a63ef4f6abb55a959b9dcf1 /lisp/magit-commit.el | |
| parent | 8b6bb7c7e88c298e1447ca7c86138588a3953784 (diff) | |
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.
Diffstat (limited to 'lisp/magit-commit.el')
| -rw-r--r-- | lisp/magit-commit.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el index 94ce31d..600c356 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? ")) |