Merge pull request #2173 from adbrown101/develop

tools/magit: fix git-credential-cache location
This commit is contained in:
Henrik Lissner 2019-12-09 18:32:32 -05:00 committed by GitHub
commit 833a29f0b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -27,13 +27,13 @@
(projectile-invalidate-cache nil)) (projectile-invalidate-cache nil))
;; The default location for git-credential-cache is in ;; The default location for git-credential-cache is in
;; ~/.config/git/credential. However, if ~/.git-credential-cache/ exists, then ;; ~/.cache/git/credential. However, if ~/.git-credential-cache/ exists, then
;; it is used instead. Magit seems to be hardcoded to use the latter, so here ;; it is used instead. Magit seems to be hardcoded to use the latter, so here
;; we override it to have more correct behavior. ;; we override it to have more correct behavior.
(unless (file-exists-p "~/.git-credential-cache/") (unless (file-exists-p "~/.git-credential-cache/")
(setq magit-credential-cache-daemon-socket (setq magit-credential-cache-daemon-socket
(doom-glob (or (getenv "XDG_CONFIG_HOME") (doom-glob (or (getenv "XDG_CACHE_HOME")
"~/.config/") "~/.cache/")
"git/credential/socket"))) "git/credential/socket")))
;; Magit uses `magit-display-buffer-traditional' to display windows, by ;; Magit uses `magit-display-buffer-traditional' to display windows, by