From patchwork Mon Jan 8 22:20:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58688 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6412F27BBEA; Mon, 8 Jan 2024 22:22:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D67C27BBE2 for ; Mon, 8 Jan 2024 22:22:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMy0M-0005H7-IA; Mon, 08 Jan 2024 17:21:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMy0K-0005Gz-Kq for guix-patches@gnu.org; Mon, 08 Jan 2024 17:21:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMy0K-0000dr-D9 for guix-patches@gnu.org; Mon, 08 Jan 2024 17:21:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMy0Q-0002Ee-Ly for guix-patches@gnu.org; Mon, 08 Jan 2024 17:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68335] [PATCH] etc: copyright.el: Respect git setting for name and email. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jan 2024 22:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68335@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17047524668505 (code B ref -1); Mon, 08 Jan 2024 22:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Jan 2024 22:21:06 +0000 Received: from localhost ([127.0.0.1]:37816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMxzW-0002D7-HT for submit@debbugs.gnu.org; Mon, 08 Jan 2024 17:21:06 -0500 Received: from lists.gnu.org ([2001:470:142::17]:33530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rMxzT-0002CT-0f for submit@debbugs.gnu.org; Mon, 08 Jan 2024 17:21:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1rMxzH-00055Q-7V for guix-patches@gnu.org; Mon, 08 Jan 2024 17:20:51 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1rMxzE-0007qD-Gk for guix-patches@gnu.org; Mon, 08 Jan 2024 17:20:50 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 1DA6A24CA19; Mon, 8 Jan 2024 22:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704752444; bh=K0Kvj3zisX8+IDIqGTU35NkM4jXdwJqMcZGqYyBj4KY=; h=From:To:Cc:Subject:Date; b=o1G+ekYVkl0ryKek99gXp0HDRW1ulzMrYfKwgTCA2WKe/X6/AoJkeEVmdg/wCPc9I 9/YEHaW6mSv2SZGNTYUq0BkUKROHIhGOGkX0+cQG1SCB2ne3qDusUsfaRtBGFwJCCi 6xst6PegM835Nizbf6e5ruyZHkfltaq5YQ7nmxK/U9Ew3XFhoGehRwpMTs9DTY8cAo 4SRblhkiCSVsH2Hw3rFfKq9EFI8z1qQLiXcDrYGutvLDNb/nzHQLtLI6LrwgSPSIc0 4vqqkS/G5BXgAsPJI42a7WZ1NiEfx5lXeZFECON3TdTdY1i7yIGOSLUvLfTPSXXDyf hLx8WEUSt+TN9QZCuGBgkAQNfufn4J/gMPQrfwMgCGhfW+v6CtP9W/UWSPz6KMRkO1 2IQJbkEwVTQyWH1TCKBS8Rp2CPbV4T9ht3DYdILe8l2IbH885pVA+2TnlH4qqvekCw o/3lGXu5LYKA8pNqFndGluwEkGhyt6BUSlcYqWXwKEpSta1uYZzDRiNGsvqvHAzxDk sOOrlQDcaSwO78Ya5VAeyM9sUR20Khq3vCLlWIA1iJ2kp5VQVqTneXDwF6RfOtYM1t A3v+DPY579UfKSRtWtuLR5qHGo0Fac/wjEiSLvbXOiBDBqp8iS7UhQp1Q/ON+W/aa5 L+A/gw/wkEBefvzsKTCTAYg4= Received: from localhost (unknown [146.70.134.143]) by wolfsden.cz (Postfix) with ESMTPSA id 1426B24CB9B; Mon, 8 Jan 2024 22:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704752443; bh=K0Kvj3zisX8+IDIqGTU35NkM4jXdwJqMcZGqYyBj4KY=; h=From:To:Cc:Subject:Date; b=HOd00t0Hhdjl4+O1UkELyU0/XFcnIYkegyMVoNN5WZKnpQHrV7dpkVdNtpkqJY5Gm 5Ct2hi/ikMvqRXrnGNinlQRv5K+PTikDTHX2PyLasgqhW2IXYhdobMZS/YIq+hGbax Y/RZpEe0qcWCqoIe9nNhdZD6EEQx4HL/ddS1UXcFmH0M/IPRXgWrG0ZzysG+lCOlfz KBLTATwnYifTWXUvpUw1JLm44QgiS+YGDoVg9uVKSdGxXXMWn8QjMhmUxNVZd7IV35 pDklb7hEF0HBmEvO+33YbtlwD45AT05jX53MwqmNZWYI86UEMY7cFVL/JXH7UShGbC ptVRQLI6sclbx+RJkBexE/RwgQNDgbIstb3hp8gYgjEg9bkYZauGwk13rfrGwfTqeL d/JqBxFz+WJrBfP0+XxR9lrkDFjCJGCGgDxHCZuHHXe9hvQFhdqa8dqlJ3+cCmv58m SL+aOVvOXfIXDdLPCb3bq0h+42rZNryccvg0nydxUkBJ8K8QEcl7/Np9mm6gYnSfcr fbhnBicwxlt7Z5tGKLwNtFiCJ6pUkZ5XNun23nicWsrgpJYvwfM/Yt6lRSYnU+vnWq X9jHiTbesx0aHBWrJnqzg0/KvDb+dzeTqhwj9Dz53J1XdTLQchXisu8Yd3YaKWZGeu 2prDeGj5KTfCjE652M0KB9iM= From: Tomas Volf <~@wolfsden.cz> Date: Mon, 8 Jan 2024 23:20:36 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 --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 : " 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