branch: elpa/magit
commit 4a791889af0b9ee57c51fb7b4cf4bdd31b8a93b6
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-ignore-submodules-p: Return nil for value "none"
---
docs/CHANGELOG.4 | 4 ++++
lisp/magit-git.el | 15 +++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/docs/CHANGELOG.4 b/docs/CHANGELOG.4
index 19d6277710..b1d9a269a4 100644
--- a/docs/CHANGELOG.4
+++ b/docs/CHANGELOG.4
@@ -36,6 +36,10 @@
- Added help text for the ~Filter!~ status section. #5121
+Bugfixes:
+
+- ~magit-ignore-submodules-p~ didn't return ~nil~ for ~none~.
+
* v4.6.0 2026-07-01
The primary focus of this release are blob-visiting buffers. For
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 5f0f0fe985..c7c6a1acbd 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -1468,12 +1468,15 @@ are considered."
(not (magit-module-worktree-p module)))
(defun magit-ignore-submodules-p (&optional return-argument)
- (or (cl-find-if (##string-prefix-p "--ignore-submodules" %)
- magit-buffer-diff-args)
- (and$ (magit-get "diff.ignoreSubmodules")
- (if return-argument
- (concat "--ignore-submodules=" $)
- (concat "diff.ignoreSubmodules=" $)))))
+ (or (and-let* ((arg (cl-find-if (##string-prefix-p "--ignore-submodules" %)
+ magit-buffer-diff-args))
+ (_(not (equal arg "--ignore-submodules=none"))))
+ arg)
+ (and-let* ((val (magit-get "diff.ignoreSubmodules"))
+ (_(not (equal $ "none"))))
+ (if return-argument
+ (concat "--ignore-submodules=" val)
+ (concat "diff.ignoreSubmodules=" val)))))
;;; Revisions and References
