disable evil-surround in magit-status buffers (#15462)

layers/+source-control/git/packages.el

@@ -24,6 +24,7 @@
 (defconst git-packages
   '(
     evil-collection
+    evil-surround
     fill-column-indicator
     ;; forge requires a C compiler on Windows so we disable
     ;; it by default on Windows.
@@ -55,6 +56,12 @@
     :post-config
     (add-to-list 'golden-ratio-exclude-buffer-names " *transient*")))
 
+;; evil-surround bindings interfere with line-wise staging
+(defun git/post-init-evil-surround ()
+  (spacemacs|use-package-add-hook magit
+    :post-config
+    (add-hook 'magit-status-mode-hook #'turn-off-evil-surround-mode)))
+
 (defun git/pre-init-evil-collection ()
   (when (spacemacs//support-evilified-buffer-p)
     (add-to-list 'spacemacs-evil-collection-allowed-list 'magit)