From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id GHKuOjcERmS6/QAASxT56A (envelope-from ) for ; Mon, 24 Apr 2023 06:23:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id IJugOjcERmS1IAAA9RJhRA (envelope-from ) for ; Mon, 24 Apr 2023 06:23:19 +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 77C23ABA2 for ; Mon, 24 Apr 2023 06:23:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqnjF-0003Hg-VN; Mon, 24 Apr 2023 00:23:05 -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 1pqnjE-0003Gy-Bp for bug-guix@gnu.org; Mon, 24 Apr 2023 00:23: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 1pqnjE-0007jK-41 for bug-guix@gnu.org; Mon, 24 Apr 2023 00:23:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqnjD-0005fF-Da for bug-guix@gnu.org; Mon, 24 Apr 2023 00:23:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#58813: [PATCH v2 3/5] Makefile.am: Auto-configure Git on 'make'. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 24 Apr 2023 04:23: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: Maxim Cournoyer , 58813@debbugs.gnu.org Cc: ludo@gnu.org, zimon.toutoune@gmail.com Received: via spool by 58813-submit@debbugs.gnu.org id=B58813.168231013721705 (code B ref 58813); Mon, 24 Apr 2023 04:23:03 +0000 Received: (at 58813) by debbugs.gnu.org; 24 Apr 2023 04:22:17 +0000 Received: from localhost ([127.0.0.1]:47295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqniS-0005e0-Rd for submit@debbugs.gnu.org; Mon, 24 Apr 2023 00:22:17 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:57551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqniP-0005dl-Ba for 58813@debbugs.gnu.org; Mon, 24 Apr 2023 00:22:14 -0400 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-5066ce4f490so5783138a12.2 for <58813@debbugs.gnu.org>; Sun, 23 Apr 2023 21:22:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682310127; x=1684902127; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=OQdPwsUnVNa1YH/xK8tGb8D3uIihZ49FYoJLGmdzrF8=; b=lGLxIMILfV8eHHP/Ke2R+3BBIQACZCyFlSubAc0ugK3FAu9ikvYjS+zN53Fggc0VAE t6/vVZPtyrfT5W/zjE8NxoW6+NJ9V3hVvb1KSOoR6A3+2DQo6VGtlgspMbHGkd6fazFo uJYS9d/MrAd0AmTH5iFAKX5rnN56MUYrphvX1DXBxi5KuEf6BuEQnTNWzJK9za+jId3G se16W/dJqJicwEHPV/ixjd1j8Ekt47aSgRD4T4YBmWPmgXZQ9rAkir68Mw9q6FYqF5fw iufuWRG2RsYnv1a+VXxqsyWIXmoWGeO//EfUReqDdZ7WlU5rlQVc3MdTiTP2vopemyEp 81fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682310127; x=1684902127; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=OQdPwsUnVNa1YH/xK8tGb8D3uIihZ49FYoJLGmdzrF8=; b=cYMqHNoat7uCuXdPmD9h/FVZtpSS9m0h9K4w1IRqgluM8xris3Hskn3QSPjU1PLO7S 9cE5bhTF6eFcMupLNoIEd2dnKXv828xRdvSeGWiob6x9X3qxgjovJ9sBtK0uEMJY3cOn FfEMmbWHVxWHJiYP7CoZatWahrw76McQvTLTq1/uThbwICJ52EYJTqKmf0xGuzPNmEfU qHbWwyxu83mP2lXd1aAHfHzjWAcr47wmyg4U2R/mNL0N5b2pMK61aGujV+xUMy66KfRW Ebx1X3yFEVb68rxdhRLu7BK7kfR/xnJ+9jKmAeb5QDPWTBfnZePM7cYBp0lJkwAiMmQJ xTPg== X-Gm-Message-State: AAQBX9eD3R6nqTIIIKQm02hhOjCNigMyoGO4bJKUiNMpKf23xlFlxENX QCHn/ONaFiRDyYu6kaKV3WA= X-Google-Smtp-Source: AKy350Zf1ldsIgc2dRM0BoiPBAX0IZTABhMuhH3OKU3VtskvHdo+6gp6oChVduLl9iyAluzAcGnSEg== X-Received: by 2002:a05:6402:7c2:b0:508:4954:e30c with SMTP id u2-20020a05640207c200b005084954e30cmr11714293edy.11.1682310127340; Sun, 23 Apr 2023 21:22:07 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e17-20020aa7d7d1000000b00508480633bdsm4321970eds.74.2023.04.23.21.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Apr 2023 21:22:06 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Mon, 24 Apr 2023 06:22:05 +0200 In-Reply-To: References: <5b9af4fa77a89c6a4b169dc464f414b1a4166d60.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 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=1682310199; a=rsa-sha256; cv=none; b=I+Jiuxk7W/7VBimnhxWvkQGxgONNGgw2tTYzA1UH10TD4BZm0lBKKs+o0h0aEF8dEVfxud iJ00VVuFiyO0THdYs3Wi5mi+iUdfCjlwD4NxCkN2cbgeW2PISCbitF4FoT9e2jhkH2Yysr cYCUYUl+wc5QyOAuX+1Pfk0hXoL+cPv7AmNF12byNr2DswXYhfZuN4MA5p0xFcDEGjTPFi m4/SWWwVPnNuUy1a59V/a5GJqA0ZEBkUAkcEWuLkgbTd0fMvbFXoHCmSojub/8q6GTNNYb UVGPaqpq82Mhdx+DCarqt0AgZuifhvBZUYrivJhESTPVks6AbYPBoZJmonttCg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=lGLxIMIL; 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=1682310199; 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=OQdPwsUnVNa1YH/xK8tGb8D3uIihZ49FYoJLGmdzrF8=; b=cYY0KyhWESQhwBZFH3UJX+O28w/tuA2QdyQtdgVTDoUbUPldsT0601Ao65lT7o4yJxK7oQ lDPQF+CjA9FFmgvljpZJsU4JMjS3kIsnPCqDxXCyJF1WjO5ZpjJWbmKabwdT6ZRH7rUVPJ NSXtQ2c0Fh1ck19FGeuiyQoYMwr/jJLK/MPmdOD1r0yYPX8RK42yDxXofz1wm30zaA3PtR Uhefqxv1rp5o07pKi1N96p+770YlEg7XcnhM92gIcWVf4NaDWiG7Pl35i1eH8oTSsmxrdP pxvHAULk84OhrDYUwsP+CaKkxhuSY9Ztxjejw0g3zBSUOEzWYY83JJ6XSWso2Q== 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=lGLxIMIL; 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: 77C23ABA2 X-TUID: itSY1CWLD2Ki Am Sonntag, dem 23.04.2023 um 22:29 -0400 schrieb Maxim Cournoyer: > This means we do not need to worry anymore about manually syncing the > pre-push git hook or the Guix-provided git configuration. IIUC we still need to invoke 'make .git/whatever' manually, and I'd actually like it to be that way, just with a nice phony target like 'make git-config' or 'make .git'. WDYT? > * 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. > --- > =C2=A0Makefile.am=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 10 ++++++++++ > =C2=A0etc/git/gitconfig | 15 +++++++++++++++ > =C2=A02 files changed, 25 insertions(+) >=20 > diff --git a/Makefile.am b/Makefile.am > index 23b939b674..7daa7d66f7 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -14,6 +14,7 @@ > =C2=A0# Copyright =C2=A9 2018 Oleg Pykhalov > =C2=A0# Copyright =C2=A9 2018 Alex Vong > =C2=A0# Copyright =C2=A9 2019 Efraim Flashner > +# Copyright =C2=A9 2020, 2021, 2023 Maxim Cournoyer > > =C2=A0# Copyright =C2=A9 2021 Chris Marusich > =C2=A0# Copyright =C2=A9 2021 Andrew Tropin > =C2=A0# > @@ -1109,6 +1110,15 @@ cuirass-jobs: $(GOBJECTS) > =C2=A0.PHONY: clean-go make-go as-derivation authenticate > =C2=A0.PHONY: update-guix-package update-NEWS cuirass-jobs release > =C2=A0 > +# Git auto-configuration. > +.git/hooks/pre-push: etc/git/pre-push > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cp etc/git/pre-push .git/hooks= /pre-push > + > +.git/config: etc/git/gitconfig > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0git config include.path ../etc= /git/gitconfig > + > +nodist_noinst_DATA =3D .git/hooks/pre-push .git/config > + > =C2=A0# Downloading up-to-date PO files. > =C2=A0 > =C2=A0WEBLATE_REPO =3D 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] > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 gpgsign =3D true > + > =C2=A0[diff "scheme"] > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0xfuncname =3D "^(\\(defin= e.*)$" > =C2=A0 > =C2=A0[diff "texinfo"] > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0xfuncname =3D "^@node[[:s= pace:]]+([^,]+).*$" > + > +[format] > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 useAutoBase =3D true > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 thread =3D shallow > + > +[pull] > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rebase =3D true > + > +[sendemail] > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 to =3D guix-patches@gnu.org > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 headerCmd =3D etc/teams.scm c= c-members-header-cmd > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 thread =3D no Otherwise LGTM. Cheers