From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mMwLCN3pRWSaIgAASxT56A (envelope-from ) for ; Mon, 24 Apr 2023 04:30:53 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SFH/B93pRWR3zwAAauVa8A (envelope-from ) for ; Mon, 24 Apr 2023 04:30:53 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 95F6FF36D for ; Mon, 24 Apr 2023 04:30:52 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqlxy-0000Zl-4F; Sun, 23 Apr 2023 22:30:10 -0400 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 1pqlxs-0000Ye-8m for bug-guix@gnu.org; Sun, 23 Apr 2023 22:30:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqlxs-00011D-0W for bug-guix@gnu.org; Sun, 23 Apr 2023 22:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqlxr-0002PP-SI for bug-guix@gnu.org; Sun, 23 Apr 2023 22:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#58813: [PATCH v2 3/5] Makefile.am: Auto-configure Git on 'make'. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 24 Apr 2023 02:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58813 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 58813@debbugs.gnu.org Cc: ludo@gnu.org, liliana.prikler@gmail.com, Maxim Cournoyer , zimon.toutoune@gmail.com Received: via spool by 58813-submit@debbugs.gnu.org id=B58813.16823033879172 (code B ref 58813); Mon, 24 Apr 2023 02:30:03 +0000 Received: (at 58813) by debbugs.gnu.org; 24 Apr 2023 02:29:47 +0000 Received: from localhost ([127.0.0.1]:47258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqlxa-0002Nl-SX for submit@debbugs.gnu.org; Sun, 23 Apr 2023 22:29:47 -0400 Received: from mail-qv1-f53.google.com ([209.85.219.53]:57510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqlxW-0002Mp-Au for 58813@debbugs.gnu.org; Sun, 23 Apr 2023 22:29:42 -0400 Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-5f3da4f91a0so17190836d6.2 for <58813@debbugs.gnu.org>; Sun, 23 Apr 2023 19:29:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682303376; x=1684895376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oEcUNFajXOLCspoU6kH+1kUaPdSj09TtprsHdAJc+/4=; b=ce89TBs6AS7VxBVX7igl5URT+GPdOmXJj7qepcFZByAyf/GU+1Lgl10mmMfiFNx+hs 5Y4vGP43HOqyUFt3bss8kcxvJH/tiAQ4Ni6oZgOCugmcVeL41iRI2VJvpcaGE0tJxpxE JIOyCMoLW8YE1xridwPGAzJ0mjvfYJoYnZt3+xt/qZq/QGjG2IvnNElNsyGGAamERKTX KHZYSGCnk18WMIDPqOrtXF7u1rBCnUl2BviFeicdFvdzrgewbd8is7QygW6V7ObIqkJ7 myLJudZLuFwGjqYyOcKkKBjUPnYjYfFCQb+00zr0PzhqTPrEjmHBeB53DF56xlpQkFVO 5Q4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682303376; x=1684895376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oEcUNFajXOLCspoU6kH+1kUaPdSj09TtprsHdAJc+/4=; b=Qo7F9YpKA3xL3fE49aTXcrKDULbERKMflE6hx/CTj0QDPBfEsglY0VRiFNoFUHY/eJ 3n+TUTc90WqHIHNA3xO95digtD2ceBvYO2z2U+BHO2sE4+fLaV7wbimg9AH4PiojcuqI 0vQ2M4NLoO1sUfSWGyBv7qjSsRwulSHiiA3oyBTtd1eUNjvfjD6bFx7C+pz8tjJN8Kki Zi6JTUAn2gWh2S6sBeshRlvSo5ZCWAAoNd5Twm5SjGvnqd3TFYGZCbLLwylEfOYMzRYK W0FqyaCMlvQFovTsKgG0BgtsFc1QJEIXJS1064AU/MkcRhnUSr7b++s5BDbkHSTmLA9S 3p7g== X-Gm-Message-State: AAQBX9fGjsfKpsBFmNsrOd4lVKeBwCMt/0M+GxTEh5Z4jCETaGbkPiIt MYFjAaKOjUc0USat0TlpFi/GMTaRyT4= X-Google-Smtp-Source: AKy350Y0nj4wFZRkKYsNnLjsu5kAUuE2HwTg9sIy/0VvNzBIqCKxju4nz+HJsDBn9vBHkg/7yZzNRw== X-Received: by 2002:a05:6214:20c9:b0:5ef:4c7a:f63d with SMTP id 9-20020a05621420c900b005ef4c7af63dmr21374608qve.0.1682303376636; Sun, 23 Apr 2023 19:29:36 -0700 (PDT) Received: from localhost.localdomain (dsl-141-20.b2b2c.ca. [66.158.141.20]) by smtp.gmail.com with ESMTPSA id a4-20020a0ce384000000b005ef658e65b8sm2986472qvl.121.2023.04.23.19.29.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Apr 2023 19:29:36 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 23 Apr 2023 22:29:25 -0400 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: <5b9af4fa77a89c6a4b169dc464f414b1a4166d60.camel@gmail.com> References: <5b9af4fa77a89c6a4b169dc464f414b1a4166d60.camel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682303452; a=rsa-sha256; cv=none; b=uXCuIZ4Ft1n266Jq3Id8BMYJj6SCMTAhKlwY7I9p/MzJiKCLUyZRMiaqMcBaBbw/F3/35B X2sQF+CAwohkuOhY35ovZrSTyiupxONk2lYmh5/AAFEOnkfaggunrqvmN2UU4xvh72vtfV 0Q/kSba1gUfSsG2DpIcKS6V34CrxWH8XFnbeCYkToDxLTdjmsQkE6YP3LQcrJfh8e4pubm kA+s5xnNAxwO0NquqtB3RYCxCzhFVfE1mGQGdUJsOytQoJvpjSxThAMmFdHX+3ngEGVwu0 B98RS73RTYvHpV3vH+7MRZLNDDHkEow0qatpYAreT7yxgzGNaflcaPChG8L8Yg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ce89TBs6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1682303452; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=oEcUNFajXOLCspoU6kH+1kUaPdSj09TtprsHdAJc+/4=; b=RNSO9TPSZJVM1hHDgq+Qwo+VSNm6EETB2QdWAYB38FhoiO9UrMyE+DlQfx5SyhoYdE9tF9 3Lpj6lkiwjZbIgG26d4jyt13VmpXvne9jQn34l+oXU16mCnB0Z4fMu/FSKmcRpwI54c7ty Cs9i5o5/pxtUVu/1YIBv+Rqj5EfOq7MnkSZlqtXO6FG7bT93MM+Hdkkz77TbmGifM1AG0w jI86846bUAZKgTXCT+PPfk9tPIGLA/6MyCFgMwiFdJWPWjK+/YnOqEHRGHQyKspuSW/0Vg MZ+st6C6aW2D6kJnhDfIbT4jwK7vCpMSvUz+nf1kmGHtuD6kTRsbn75zyijOAA== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=ce89TBs6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.29 X-Spam-Score: 7.29 X-Migadu-Queue-Id: 95F6FF36D X-TUID: l4bFVW6acK8D This means we do not need to worry anymore about manually syncing the pre-push git hook or the Guix-provided git configuration. * etc/git/gitconfig: Augment configuration template with useful options to allow for auto-configuration. * Makefile.am (.git/hooks/pre-push, .git/config): New targets. (nodist_noinst_DATA): New primary variable holding the above targets. --- Makefile.am | 10 ++++++++++ etc/git/gitconfig | 15 +++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/Makefile.am b/Makefile.am index 23b939b674..7daa7d66f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,7 @@ # Copyright © 2018 Oleg Pykhalov # Copyright © 2018 Alex Vong # Copyright © 2019 Efraim Flashner +# Copyright © 2020, 2021, 2023 Maxim Cournoyer # Copyright © 2021 Chris Marusich # Copyright © 2021 Andrew Tropin # @@ -1109,6 +1110,15 @@ cuirass-jobs: $(GOBJECTS) .PHONY: clean-go make-go as-derivation authenticate .PHONY: update-guix-package update-NEWS cuirass-jobs release +# Git auto-configuration. +.git/hooks/pre-push: etc/git/pre-push + cp etc/git/pre-push .git/hooks/pre-push + +.git/config: etc/git/gitconfig + git config include.path ../etc/git/gitconfig + +nodist_noinst_DATA = .git/hooks/pre-push .git/config + # Downloading up-to-date PO files. WEBLATE_REPO = https://framagit.org/tyreunom/guix-translations diff --git a/etc/git/gitconfig b/etc/git/gitconfig index c9ebdc8fa8..0b6984a05f 100644 --- a/etc/git/gitconfig +++ b/etc/git/gitconfig @@ -1,5 +1,20 @@ +[commit] + gpgsign = true + [diff "scheme"] xfuncname = "^(\\(define.*)$" [diff "texinfo"] xfuncname = "^@node[[:space:]]+([^,]+).*$" + +[format] + useAutoBase = true + thread = shallow + +[pull] + rebase = true + +[sendemail] + to = guix-patches@gnu.org + headerCmd = etc/teams.scm cc-members-header-cmd + thread = no -- 2.39.2