From eccf4d5b648292bb4db57e1a7c1d5f8b4a641c80 Mon Sep 17 00:00:00 2001
From: Ralf Zerres <ralf.zerres@networkx.de>
Date: Wed, 24 Jun 2020 01:36:03 +0200
Subject: [PATCH] 501-git: reorganize use-packages

* magit custom adaptions
* new defun 'my/magit-default.options'
* enforce package ''magithub'

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
---
 site-start.d/501-git.el | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/site-start.d/501-git.el b/site-start.d/501-git.el
index 42cee0d..1f0e38b 100644
--- a/site-start.d/501-git.el
+++ b/site-start.d/501-git.el
@@ -17,13 +17,15 @@
 	 ("<C-tab>" . magit-section-cycle)
 	 :map magit-branch-section-map
 	 ("RET" . magit-checkout))
+  :custom
+  (magit-use-overlays nil)
+  (magit-section-visibility-indicator nil)
+  (magit-completing-read-function 'ivy-completing-read)
+  (magit-push-always-verify nil)
+  (magit-repository-directories '("~/src/"))
+  (bind-key "v" 'visit-pull-request-url magit-mode-map)
   :config
   (add-hook 'after-save-hook 'magit-after-save-refresh-status)
-  (setq magit-use-overlays nil
-	magit-section-visibility-indicator nil
-	magit-completing-read-function 'ivy-completing-read
-	magit-push-always-verify nil
-	magit-repository-directories '("~/src/"))
   (use-package git-timemachine
     :bind (("C-x v t" . git-timemachine)))
   (use-package git-link
@@ -42,27 +44,34 @@
 			 (magit-get-remote)
 			 "url"))
 	     (cdr (magit-get-remote-branch)))))
-
-  (bind-key "v" 'visit-pull-request-url magit-mode-map)
+  (defvar my/magit-default-options
+    `(
+      (pulling "--rebase")
+      ))
+)
 
   ;; Do Not Show Recent Commits in status window
   ;; https://github.com/magit/magit/issues/3230#issuecomment-339900039
   (magit-add-section-hook 'magit-status-sections-hook
 			  'magit-insert-unpushed-to-upstream
 			  'magit-insert-unpushed-to-upstream-or-recent
-			  'replace))
+			  'replace)
 
 ;; load forge to handle github, gitlab, etc
 ;;(require 'forge)
 (use-package forge
+  :ensure t
   :after magit)
 
-(defvar my/magit-default-options
-  `(
-    (pulling "--rebase")
-    ))
+(use-package magithub
+  :ensure t
+  :after magit
+  :config
+  (magithub-feature-autoinject t)
+  (setq magithub-clone-default-directory "~/github"))
 
 ;;(advice-add 'magit-key-mode :filter-args #'magit-key-mode--add-default-options)
 
 (provide '501-git)
+;; End:
 ;;; 501-git.el ends here