branch: elpa/magit
commit 230b91d819210efb93396be9dee53ff8f815f560
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit--insert-{diff,log}: Respect magit--git-wash-keep-error
---
lisp/magit-diff.el | 4 +++-
lisp/magit-log.el | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 1f561e9fe59..224a28d25a3 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -2156,7 +2156,9 @@ keymap is the parent of their keymaps."
(append magit-diff--reset-non-color-moved
magit-git-global-arguments)))
(magit--git-wash #'magit-diff-wash-diffs
- (if (member "--no-index" args) 'wash-anyway keep-error)
+ (if (member "--no-index" args)
+ 'wash-anyway
+ (or keep-error magit--git-wash-keep-error))
cmd args)))
(defun magit-diff--maybe-add-stat-arguments (args)
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 3b39a6ebdc9..5cb89408cdc 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -1177,7 +1177,8 @@ Do not add this to a hook variable."
(setq magit-section-preserve-visibility t) ; TODO do it here?
(let ((magit-git-global-arguments
(remove "--literal-pathspecs" magit-git-global-arguments)))
- (magit--git-wash (apply-partially #'magit-log-wash-log 'log) keep-error
+ (magit--git-wash (apply-partially #'magit-log-wash-log 'log)
+ (or keep-error magit--git-wash-keep-error)
"log"
(format "--format=%s%%h%%x0c%s%%x0c%s%%x0c%%aN%%x0c%s%%x0c%%s%s"
(if (and (member "--left-right" args)
