[nongnu] elpa/git-commit 8b5d0b2bc6 1/2: Don’t try to evaluate startup assertions when byte-compiling

[ELPA Syncer]

branch: elpa/git-commit
commit 8b5d0b2bc6bdea24dbe93ddc53ef259ddfaa9298
Author: Philipp Stephani <phst@google.com>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    Don’t try to evaluate startup assertions when byte-compiling
    
    Fixes #4640.
---
 lisp/magit.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lisp/magit.el b/lisp/magit.el
index 50cebf5928..3b6411caae 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -616,7 +616,7 @@ and Emacs to it."
      ;; See comment above.
      "https://github.com/magit/magit/wiki/Don't-set-$GIT_DIR-and-alike"))
   ;; Git isn't required while building Magit.
-  (cl-eval-when (load eval)
+  (unless byte-compile-current-file
     (magit-git-version-assert))
   (when (version< emacs-version magit--minimal-emacs)
     (display-warning 'magit (format "\
@@ -672,10 +672,11 @@ For X11 something like ~/.xinitrc should work.\n"
 (with-eval-after-load 'bookmark
   (require 'magit-bookmark))
 
-(if after-init-time
-    (progn (magit-startup-asserts)
-           (magit-version))
-  (add-hook 'after-init-hook #'magit-startup-asserts t)
-  (add-hook 'after-init-hook #'magit-version t))
+(unless byte-compile-current-file
+  (if after-init-time
+      (progn (magit-startup-asserts)
+             (magit-version))
+    (add-hook 'after-init-hook #'magit-startup-asserts t)
+    (add-hook 'after-init-hook #'magit-version t)))
 
 ;;; magit.el ends here