From 94fc6f714ffbdc9f6275c555cd537c94b0a5c543 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 20 May 2020 01:10:15 -0400 Subject: [PATCH] Bump :tools magit magit/magit@d27d6e4 -> magit/magit@b1b2683 magit/forge@e2da806 -> magit/forge@09bf8ad We no longer need the magit version hack, thanks to magit/magit@b1b2683 --- modules/tools/magit/autoload.el | 18 ------------------ modules/tools/magit/packages.el | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/modules/tools/magit/autoload.el b/modules/tools/magit/autoload.el index 2b4c99359..b434739ef 100644 --- a/modules/tools/magit/autoload.el +++ b/modules/tools/magit/autoload.el @@ -1,23 +1,5 @@ ;;; tools/magit/autoload.el -*- lexical-binding: t; -*- -;; HACK Magit complains loudly (but harmlessly) when it can't determine its own -;; version (in the case of a sparse clone). -;;;###autoload -(defadvice! +magit--ignore-version-a (&optional print-dest) - :override #'magit-version - (when print-dest - (defvar magit-git-debug) - (princ (format "Magit (unknown), Git %s, Emacs %s, %s" - (or (let ((magit-git-debug - (lambda (err) - (display-warning '(magit git) err :error)))) - (magit-git-version t)) - "(unknown)") - emacs-version - system-type) - print-dest)) - nil) - ;;;###autoload (defun +magit-display-buffer-fn (buffer) "Same as `magit-display-buffer-traditional', except... diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el index f1bd7253d..ca527239c 100644 --- a/modules/tools/magit/packages.el +++ b/modules/tools/magit/packages.el @@ -1,9 +1,9 @@ ;; -*- no-byte-compile: t; -*- ;;; tools/magit/packages.el -(when (package! magit :pin "d27d6e467857ed4a78c7cf7d609561df789e2a6c") +(when (package! magit :pin "b1b2683f6012ff3bc29bd9cbe562246477f1523f") (when (featurep! +forge) - (package! forge :pin "e2da80660a0550f613400ce3b238025589800417")) + (package! forge :pin "09bf8adc9c9afb492632e612f51f39e1cc15fca0")) (package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b") (package! magit-todos :pin "a0e5d1f3c7dfcb4f18c1b0d57f1746a4872df5c6") (package! github-review :pin "50c6bcc7cf4d7193577b3f74eea4dd72f2b7795b")