From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2910D1382C5 for ; Tue, 30 Mar 2021 16:10:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35976E0ADB; Tue, 30 Mar 2021 16:10:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D8B2E0ADB for ; Tue, 30 Mar 2021 16:10:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4A2F335CEA for ; Tue, 30 Mar 2021 16:10:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DCB56637 for ; Tue, 30 Mar 2021 16:10:06 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1617120052.b505dd794cbf9f428f569e9c892c54e580f6a3e7.ulm@gentoo> Subject: [gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/ X-VCS-Repository: proj/devmanual X-VCS-Files: ebuild-maintenance/git/text.xml X-VCS-Directories: ebuild-maintenance/git/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: b505dd794cbf9f428f569e9c892c54e580f6a3e7 X-VCS-Branch: master Date: Tue, 30 Mar 2021 16:10:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f03e43cf-44fa-41b3-9429-3a1d6617285e X-Archives-Hash: 7ffc74c0f5e405c4b6468a1379f01943 commit: b505dd794cbf9f428f569e9c892c54e580f6a3e7 Author: Sam James gentoo org> AuthorDate: Sun Mar 21 04:29:53 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue Mar 30 16:00:52 2021 +0000 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=b505dd79 ebuild-maintenance/git: reference pkgcheck scan --commits and pkgdev Signed-off-by: Sam James gentoo.org> Signed-off-by: Ulrich Müller gentoo.org> ebuild-maintenance/git/text.xml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml index 5240f6a..fc2738a 100644 --- a/ebuild-maintenance/git/text.xml +++ b/ebuild-maintenance/git/text.xml @@ -113,10 +113,10 @@ the historical commits after the initial git commit.

The recommended way of committing to the Gentoo repository is to use repoman -commit. It automatically performs the necessary QA checks on the package -being committed and has other features helping with the Gentoo workflow. -However, it is currently limited to creating a single commit to a single -package. +commit or pkgdev commit (then pkgdev push). It automatically +performs the necessary QA checks on the package being committed and has other +features helping with the Gentoo workflow. However, repoman is currently +limited to creating a single commit to a single package.

@@ -127,17 +127,18 @@ used. The valid uses of git include:

  • creating commits spanning multiple packages and/or multiple areas of the Gentoo repository (eclasses, licenses, profiles…),
    • -
  • amending a commit created via repoman commit with additional files -or fixups,
    • -
  • combining multiple commits created via repoman commit using git -rebase.
    • +
  • amending a commit created via repoman commit or pkgdev commit +with additional files or fixups,
    • +
  • combining multiple commits created via repoman commit or +pkgdev commit using git rebase.

-Whenever repoman is not used to commit, you need to manually verify all -packages affected by the commit using repoman full. Since repoman -is not aware of staged changes, please make sure that all files are included -in the commit. Also when not using repoman, you must perform a manual sign-off +Whenever repoman or pkgdev is not used to commit, you need to +manually verify all packages affected by the commit using repoman full or +pkgcheck scan --commits. When using repoman, it won't be aware of +staged changes, so ensure that all files are included in the commit. +Also, when using git manually, you must perform a manual sign-off to the Certificate of Origin using the -s or --signoff option with your git commit commands. Make sure you have read and understand the @@ -219,8 +220,8 @@ appropriately:

    -
  • ${CATEGORY}/${PN}:Single Package (Note that repoman commit -automatically inserts this for you)
    • +
  • ${CATEGORY}/${PN}: Single Package (Note that repoman commit +and pkgdev commit will automatically insert this for you)
  • ${CATEGORY}: Package Category
  • profiles: Profile Directory
  • ${ECLASS}.eclass: Eclass Directotry