From 260148f4e940f11513a7e8867604dc9cb70987c4 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 2 Mar 2020 12:02:49 -0500
Subject: [PATCH] Bump :tools magit

magit/magit@8cb6cdf -> magit/magit@c8cd22e
magit/forge@fb04716 -> magit/forge@0ade907
emacs-evil/evil-magit@1bfd546 -> emacs-evil/evil-magit@0b79aa3

Fixes #2446
---
 modules/tools/magit/config.el   | 19 +------------------
 modules/tools/magit/packages.el |  6 +++---
 modules/ui/ophints/config.el    |  4 ++++
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index d16d1b198..8205a4aa3 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -172,21 +172,4 @@ ensure it is built when we actually use Forge."
         (setcar desc (cdr key))))
     (evil-define-key* evil-magit-state git-rebase-mode-map
       "gj" #'git-rebase-move-line-down
-      "gk" #'git-rebase-move-line-up))
-
-  ;; HACK Temporarily fix hlissner/doom-emacs#2446. evil-magit binds yy to
-  ;;      evil-yank-line. This command is what Y is bound to in normal mode and
-  ;;      it respects evil-want-Y-yank-to-eol, which is set to t by default (the
-  ;;      default behavior in vim).
-  (evil-define-operator evil-magit-yank (beg end type register)
-    :motion evil-line-or-visual-line
-    :move-point nil
-    (interactive "<R><x>")
-    (evil-yank beg end type register))
-  (evil-magit-define-key 'normal 'magit-mode-map "yy" #'evil-magit-yank)
-  (after! evil-goggles
-    (pushnew! evil-goggles--commands
-              '(evil-magit-yank
-                :face evil-goggles-yank-face
-                :switch evil-goggles-enable-yank
-                :advice evil-goggles--generic-async-advice))))
+      "gk" #'git-rebase-move-line-up)))
diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el
index 0f9a09ec0..97209f3af 100644
--- a/modules/tools/magit/packages.el
+++ b/modules/tools/magit/packages.el
@@ -1,10 +1,10 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/magit/packages.el
 
-(when (package! magit :pin "8cb6cdf3e4")
-  (package! forge :pin "fb04716b64")
+(when (package! magit :pin "c8cd22e28d")
+  (package! forge :pin "0ade907a46")
   (package! magit-gitflow :pin "cc41b561ec")
   (package! magit-todos :pin "ad5663aa26")
   (package! github-review :pin "1de2d6d148")
   (when (featurep! :editor evil +everywhere)
-    (package! evil-magit :pin "1bfd546be8")))
+    (package! evil-magit :pin "0b79aa33a4")))
diff --git a/modules/ui/ophints/config.el b/modules/ui/ophints/config.el
index ef1633730..c94aab8c3 100644
--- a/modules/ui/ophints/config.el
+++ b/modules/ui/ophints/config.el
@@ -12,6 +12,10 @@
         evil-goggles-enable-change nil)
   :config
   (pushnew! evil-goggles--commands
+            '(evil-magit-yank-whole-line
+              :face evil-goggles-yank-face
+              :switch evil-goggles-enable-yank
+              :advice evil-goggles--generic-async-advice)
             '(+evil:yank-unindented
               :face evil-goggles-yank-face
               :switch evil-goggles-enable-yank