diff mbox series

[bug#68335] etc: copyright.el: Respect git setting for name and email.

Message ID ee71fcaa85a69a2b8fac55032d0f847da1839f2b.1704752436.git.~@wolfsden.cz
State New
Headers show
Series [bug#68335] etc: copyright.el: Respect git setting for name and email. | expand

Commit Message

Tomas Volf Jan. 8, 2024, 10:20 p.m. UTC 
Users might want to use different identity for their global emacs config and
for the Guix repository.  In case they differ, there seems to be little reason
not to prefer the git's setting.  Assuming magit is available, use the
user.name and user.email, with fallback to user-full-name and
user-mail-address respectively.

* etc/copyright.el (guix-copyright): Use git's user.name and user.email if
available.

Change-Id: Iad1c07681b38beeebf0feeda18702258ffb5d918
---
 etc/copyright.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


base-commit: b212e6934643e085f168a5364cb593f61aa616ba
diff mbox series

Patch

diff --git a/etc/copyright.el b/etc/copyright.el
index f5ed723cea..fdd67535d9 100644
--- a/etc/copyright.el
+++ b/etc/copyright.el
@@ -28,7 +28,11 @@ 
   "FULL_NAME <MAIL_ADDRESS>: "
   comment-start
   ";; Copyright © " `(format-time-string "%Y") " "
-  (or (format "%s <%s>" user-full-name user-mail-address) str)
+  '(setq v1 (or (and (featurep 'magit) (magit-get "user.name"))
+                (user-full-name)))
+  '(setq v2 (or (and (featurep 'magit) (magit-get "user.email"))
+                (user-mail-address)))
+  (or (format "%s <%s>" v1 v2) str)
   comment-end)
 
 ;;; copyright.el ends here