branch: elpa/git-commit
commit 55656a31cc4fe6c8996c621f4cf14aa4a1bfe47d
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
magit-get{,-all,-boolean}: Get values from included files
When `magit--refresh-cache' is non-nil, a different code-path is taken,
which did already respect values set in included files. But when not
using a cache, then we have to use "--include". This only matters when
also using arguments such as "--global" and "--file". It seems like a
bad default that git defaults to "--no-include" when such an argument
is used.
---
lisp/magit-git.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index a8ed69ec9d..8e14df4dea 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -740,7 +740,7 @@ See info node `(magit)Debugging Tools' for more
information."
(key (string-join keys ".")))
(if (and magit--refresh-cache (not arg))
(magit-config-get-from-cached-list key)
- (magit-git-items "config" arg "-z" "--get-all" key))))
+ (magit-git-items "config" arg "-z" "--get-all" "--include" key))))
(defun magit-get-boolean (&rest keys)
"Return the boolean value of the Git variable specified by KEYS.
@@ -751,7 +751,7 @@ Also see `magit-git-config-p'."
(key (string-join keys ".")))
(equal (if magit--refresh-cache
(car (last (magit-config-get-from-cached-list key)))
- (magit-git-str "config" arg "--bool" key))
+ (magit-git-str "config" arg "--bool" "--include" key))
"true")))
(defun magit-set (value &rest keys)
