From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AMrRHZ2Sr2A4bwEAgWs5BA (envelope-from ) for ; Thu, 27 May 2021 14:37:49 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id YH52GZ2Sr2DVfgAAbx9fmQ (envelope-from ) for ; Thu, 27 May 2021 12:37:49 +0000 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 7659D250F6 for ; Thu, 27 May 2021 14:37:47 +0200 (CEST) Received: from localhost ([::1]:54906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmFGj-0006ZO-UM for larch@yhetil.org; Thu, 27 May 2021 08:37:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmFG5-0006X6-Pa for guix-patches@gnu.org; Thu, 27 May 2021 08:37:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39301) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmFG2-0006w1-9a for guix-patches@gnu.org; Thu, 27 May 2021 08:37:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lmFG2-0006DE-7l for guix-patches@gnu.org; Thu, 27 May 2021 08:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48696] [PATCH 1/3] doc: Structure the "Commit Access" section. References: <20210527123259.4115-1-ludo@gnu.org> In-Reply-To: <20210527123259.4115-1-ludo@gnu.org> Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 May 2021 12:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48696 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48696@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 48696-submit@debbugs.gnu.org id=B48696.162211897423796 (code B ref 48696); Thu, 27 May 2021 12:37:02 +0000 Received: (at 48696) by debbugs.gnu.org; 27 May 2021 12:36:14 +0000 Received: from localhost ([127.0.0.1]:50841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmFFG-0006Bk-Be for submit@debbugs.gnu.org; Thu, 27 May 2021 08:36:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lmFFE-0006BW-LA for 48696@debbugs.gnu.org; Thu, 27 May 2021 08:36:13 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42904) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmFF7-0006R9-Lw; Thu, 27 May 2021 08:36:07 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=40496 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmFF6-0005Bm-8p; Thu, 27 May 2021 08:36:05 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 27 May 2021 14:35:52 +0200 Message-Id: <20210527123554.4267-1-ludo@gnu.org> X-Mailer: git-send-email 2.31.1 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: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1622119067; 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; bh=e3+iFNhEdc4aCCmztFOzIgpTnZoZk6MtP17gOEFLMCQ=; b=lNeZiyZV67vLtHOaSJaO+q274+/fCSZ9ZJEZbWDgVdhdhONK5VM3Hk1v/NzV3Joi0kdPwq d80P9lHbz6HkgjkqoZ0Y5L2h6XPUFVbkTJuc2zfCAw1lVG+VSFZyNq+q4EuzOTaGnUwlQ3 Wqh5IlHJmKetTZk+IyNdU2+BTbyJ6iAaIk2rmLY94EiOaIljEf3hCQbNnN64hPHp65n08e gcBpOcOKq489fdt4FXZfXVh6x5koYrol+ilcbEoD9DLsm4qGXrniW6Uy5+lZHGIaBHZvOU DKaOH7gD4es6nVe3o8ETtUsRwOs5dE1T64UjKSAx7OUiVoGXP8WYPAnDOHsThQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622119067; a=rsa-sha256; cv=none; b=K/FP+n1CyL1q5tFwXePP/WBzhol522HoMuo9Y6HMsWx1BjQV8Swvx6wrPv9K5ln10Qn2fs Y0Mc2w6XFntYqa11fE249aS0m45SQiZAaUZyt7YTRMfxIdP1XUuiSzoVgDJg29peJOVo8r wgHK1uHOZ+U1mmbKmx65/hBalxGxxR49NX+SoyjI5zsjcIiXFw67pimRSNvnmzrdmR2IDM VCXkOI0WzpvGy/+KkiX8/xsqQmgMwVD6LwHOgzh80FLspMbqqNiAI+5SPAjlEsBpT1qXXK V9rcCBNeb8XBaRBah4Ol/DHNIlWPfPqAMuBaJGzNtwEPOP3Rt34T50zTJM32CA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.93 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 7659D250F6 X-Spam-Score: -1.93 X-Migadu-Scanner: scn0.migadu.com X-TUID: v/UAJeg+8jj3 * doc/contributing.texi (Commit Access): Add introduction and section heading. Separate OpenPGP setup from commit policy. --- doc/contributing.texi | 59 ++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index cfcae22502..7dc912b4de 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1258,8 +1258,19 @@ this nifty tool! @section Commit Access @cindex commit access, for developers -For frequent contributors, having write access to the repository is -convenient. When you deem it necessary, consider applying for commit +Everyone can contribute to Guix without having commit access +(@pxref{Submitting Patches}). However, for frequent contributors, +having write access to the repository can be convenient. Commit access +should not be thought of as a ``badge of honor'' but rather as a +responsibility a contributor is willing to take to help the project. + +The following sections explain how to get commit access, how to be ready +to push commits, and the policies and community expectations for commits +pushed upstream. + +@subsection Applying for Commit Access + +When you deem it necessary, consider applying for commit access by following these steps: @enumerate @@ -1331,6 +1342,27 @@ review and merging system, which, as a consequence, may lead us to have fewer people with commit access to the main repository. Stay tuned! @end quotation +All commits that are pushed to the central repository on Savannah must +be signed with an OpenPGP key, and the public key should be uploaded to +your user account on Savannah and to public key servers, such as +@code{keys.openpgp.org}. To configure Git to automatically sign +commits, run: + +@example +git config commit.gpgsign true +git config user.signingkey CABBA6EA1DC0FF33 +@end example + +You can prevent yourself from accidentally pushing unsigned commits to +Savannah by using the pre-push Git hook called located at +@file{etc/git/pre-push}: + +@example +cp etc/git/pre-push .git/hooks/pre-push +@end example + +@subsection Commit Policy + If you get commit access, please make sure to follow the policy below (discussions of the policy can take place on @email{guix-devel@@gnu.org}). @@ -1349,25 +1381,6 @@ mailing list for commit notifications (@email{guix-commits@@gnu.org}), so people can notice. Before pushing your changes, make sure to run @code{git pull --rebase}. -All commits that are pushed to the central repository on Savannah must -be signed with an OpenPGP key, and the public key should be uploaded to -your user account on Savannah and to public key servers, such as -@code{keys.openpgp.org}. To configure Git to automatically sign -commits, run: - -@example -git config commit.gpgsign true -git config user.signingkey CABBA6EA1DC0FF33 -@end example - -You can prevent yourself from accidentally pushing unsigned commits to -Savannah by using the pre-push Git hook called located at -@file{etc/git/pre-push}: - -@example -cp etc/git/pre-push .git/hooks/pre-push -@end example - When pushing a commit on behalf of somebody else, please add a @code{Signed-off-by} line at the end of the commit log message---e.g., with @command{git am --signoff}. This improves tracking of who did @@ -1389,12 +1402,16 @@ you're confident, it's OK to commit. That last part is subject to being adjusted, allowing individuals to commit directly on non-controversial changes on parts they’re familiar with. +@subsection Commit Revocation + In order to reduce the possibility of mistakes, committers will have their Savannah account removed from the Guix Savannah project and their key removed from @file{.guix-authorizations} after 12 months of inactivity; they can ask to regain commit access by emailing the maintainers, without going through the vouching process. +@subsection Helping Out + One last thing: the project keeps moving forward because committers not only push their own awesome changes, but also offer some of their time @emph{reviewing} and pushing other people's changes. As a committer, -- 2.31.1