Bump :tools magit

magit/magit@1c60edc -> magit/magit@4735b92
magit/forge@fa80a87 -> magit/forge@8382fd3

The same predicates are now specified in upstream magit, so there is no need to
override `safe-local-variable'.

Closes #4760

Co-authored-by: Nikita Bloshchanevich <nbfalcon@users.noreply.github.com>
This commit is contained in:
Henrik Lissner 2021-03-09 10:54:25 -05:00
parent 6139ca2e37
commit 14eb254b4b
2 changed files with 2 additions and 9 deletions

View file

@ -8,13 +8,6 @@
(when IS-WINDOWS (when IS-WINDOWS
(setenv "GIT_ASKPASS" "git-gui--askpass")) (setenv "GIT_ASKPASS" "git-gui--askpass"))
;; Don't complain when these variables are set in file/local vars
(put 'git-commit-major-mode 'safe-local-variable
(lambda (x)
(memq x '(git-commit-elisp-text-mode
text-mode fundamental-mode org-mode markdown-mode))))
(put 'git-commit-summary-max-length 'safe-local-variable 'numberp)
;; In case the user is using `bug-reference-mode' ;; In case the user is using `bug-reference-mode'
(map! :when (fboundp 'bug-reference-mode) (map! :when (fboundp 'bug-reference-mode)
:map bug-reference-map :map bug-reference-map

View file

@ -1,9 +1,9 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; tools/magit/packages.el ;;; tools/magit/packages.el
(when (package! magit :pin "1c60edc86512c53b15e753d6dca319a5e01f83a3") (when (package! magit :pin "4735b9254105eb7dd538f979d8b4c6ab96b827b9")
(when (featurep! +forge) (when (featurep! +forge)
(package! forge :pin "fa80a8789cb15c1b1c5fc7a9e328283202c75135")) (package! forge :pin "8382fd3d43855de779c46da338dd59b1cb1d333e"))
(package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b") (package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b")
(package! magit-todos :pin "78d24cf419138b543460f40509c8c1a168b52ca0") (package! magit-todos :pin "78d24cf419138b543460f40509c8c1a168b52ca0")
(package! github-review :pin "d0c8234cf523818513f892f30153210606abb6be")) (package! github-review :pin "d0c8234cf523818513f892f30153210606abb6be"))