[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: 4bdda4a2af6af15850924e1c4874aba0266a694d Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Feb 29 08:50:58 2024 + Commit: Ulrich Müller gentoo org> CommitDate: Sat Apr 13 19:41:19 2024 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=4bdda4a2 ebuild-maintenance/git: drop repoman from commit message Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Ulrich Müller gentoo.org> ebuild-maintenance/git/text.xml | 6 -- 1 file changed, 6 deletions(-) diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml index 8bef553..2f3fcb3 100644 --- a/ebuild-maintenance/git/text.xml +++ b/ebuild-maintenance/git/text.xml @@ -283,12 +283,6 @@ are optionally used in Gentoo: referenced, it will be closed (as fixed) automatically with reference to the commit. - -Package-Manager: Used by repoman to indicate Portage version - - -RepoMan-Options: Used by repoman to indicate repoman options -
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: 8db9349ee61829e0f17a98619989f94238cafabb Author: Sam James gentoo org> AuthorDate: Mon Nov 21 00:02:37 2022 + Commit: Sam James gentoo org> CommitDate: Tue Nov 22 04:17:44 2022 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8db9349e ebuild-maintenance/git: update grafted repo URL Signed-off-by: Sam James gentoo.org> Closes: https://github.com/gentoo/devmanual/pull/306 Signed-off-by: Sam James gentoo.org> ebuild-maintenance/git/text.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml index 411e406..8cdabde 100644 --- a/ebuild-maintenance/git/text.xml +++ b/ebuild-maintenance/git/text.xml @@ -90,9 +90,9 @@ graft it into the repository: -git remote add history https://anongit.gentoo.org/git/repo/gentoo/historical.git/ +git remote add history https://anongit.gentoo.org/git/archive/repo/gentoo-2.git git fetch history -git replace --graft 56bd759df1d0c750a065b8c845e93d5dfa6b549d history/master +git replace --graft 56bd759df1d0c750a065b8c845e93d5dfa6b549d cvs-final-2015-08-08
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: b541292297e709a13bcd90ce6ba5c61d9ba5eed7 Author: Joonas Niilola gentoo org> AuthorDate: Tue Sep 21 12:55:24 2021 + Commit: Ulrich Müller gentoo org> CommitDate: Sun Sep 26 09:03:52 2021 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=b5412922 ebuild-maintenance/git: link to general-concepts/copyright-policy Signed-off-by: Joonas Niilola gentoo.org> Signed-off-by: Ulrich Müller gentoo.org> ebuild-maintenance/git/text.xml | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml index 0cad9bf..cf8d6ba 100644 --- a/ebuild-maintenance/git/text.xml +++ b/ebuild-maintenance/git/text.xml @@ -145,10 +145,9 @@ 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 -https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin;> -Certificate of Origin using the -s or --signoff option -with your git commit commands. Make sure you have read and understand the -actual Certificate. + using +the -s or --signoff option with your git commit commands. Make +sure you have read and understand the actual certificate.
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: 1536e0fe2f087a80b9f21de8162e08caa890
Author: Ulrich Müller gentoo org>
AuthorDate: Tue Mar 30 16:09:41 2021 +
Commit: Ulrich Müller gentoo org>
CommitDate: Tue Mar 30 16:09:41 2021 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1536e0fe
ebuild-maintenance/git: Formatting fixes
Signed-off-by: Ulrich Müller gentoo.org>
ebuild-maintenance/git/text.xml | 125 ++--
1 file changed, 69 insertions(+), 56 deletions(-)
diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml
index fc2738a..0cad9bf 100644
--- a/ebuild-maintenance/git/text.xml
+++ b/ebuild-maintenance/git/text.xml
@@ -2,8 +2,8 @@
Git for Gentoo Developers
-
+
This guide covers git usage instructions and policies specific to Gentoo ebuild
development. It assumes that the readers possess basic git knowledge.
@@ -125,12 +125,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 or pkgdev commit
-with additional files or fixups,
-combining multiple commits created via repoman commit or
-pkgdev commit using git rebase.
+
+creating commits spanning multiple packages and/or multiple areas of the
+Gentoo repository (eclasses, licenses, profiles…),
+
+
+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.
+
@@ -138,8 +144,8 @@ 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 https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin;>
+Also, when using git manually, you must perform a manual sign-off to the
+https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin;>
Certificate of Origin using the -s or --signoff option
with your git commit commands. Make sure you have read and understand the
actual Certificate.
@@ -158,28 +164,26 @@ commits, abiding by the following three rules as much as
possible:
-
-Do not include multiple irrelevant changes in a single commit. However, make
-sure not to split relevant changes unnecessarily. For example, if a version
bump
-requires changes in the ebuild, it is correct to perform them in a single
-commit. However, if you are fixing an additional bug that has been present
-in the previous version, the fix belongs in a separate commit.
-
-
-
-Split commits at logical unit boundaries. When updating multiple packages,
-preferably use a single commit for each package. Avoid combining changes
-to ebuilds, eclasses, licenses, profiles etc. in a single commit. However,
-do not split relevant or interdependent changes within a single package.
-
-
-
-Avoid creating commits introducing a temporary breakage. Unless impossible,
-add packages in dependency install order. Add licenses before the packages
-needing them. Commit package.mask and other profile changes before
-ebuilds relying on them. Usually it is also acceptable to include those changes
-along with the commit adding the package.
-
+
+Do not include multiple irrelevant changes in a single commit. However,
+make sure not to split relevant changes unnecessarily. For example, if a
+version bump requires changes in the ebuild, it is correct to perform them
+in a single commit. However, if you are fixing an additional bug that has
+been present in the previous version, the fix belongs in a separate commit.
+
+
+Split commits at logical unit boundaries. When updating multiple packages,
+preferably use a single commit for each package. Avoid combining changes
+to ebuilds, eclasses, licenses, profiles etc. in a single commit. However,
+do not split relevant or interdependent changes within a single package.
+
+
+Avoid creating commits introducing a temporary breakage. Unless impossible,
+add packages in dependency install order. Add licenses before the packages
+needing them. Commit package.mask and other profile changes before
+ebuilds relying on them. Usually it is also acceptable to include those
+changes along with the commit adding the package.
+
@@ -220,13 +224,15 @@ appropriately:
-${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
-licenses: Licenses Directory
-metadata: Metadata Directory
+
+${CATEGORY}/${PN}: Single Package (Note that
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: b505dd794cbf9f428f569e9c892c54e580f6a3e7
Author: Sam James gentoo org>
AuthorDate: Sun Mar 21 04:29:53 2021 +
Commit: Ulrich Müller gentoo org>
CommitDate: Tue Mar 30 16:00:52 2021 +
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 https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin;>
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
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: 396932f9fbb041b273da46b8000728a28e99de52 Author: Ulrich Müller gentoo org> AuthorDate: Tue Feb 23 08:21:53 2021 + Commit: Ulrich Müller gentoo org> CommitDate: Tue Feb 23 08:21:53 2021 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=396932f9 ebuild-maintenance/git: Write tags in the same way as GLEP 66 does Namely, Suggested-by: and Reported-by: with lowercase "by". Signed-off-by: Ulrich Müller gentoo.org> ebuild-maintenance/git/text.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml index d58b35f..5240f6a 100644 --- a/ebuild-maintenance/git/text.xml +++ b/ebuild-maintenance/git/text.xml @@ -289,9 +289,9 @@ as --force) for the commit. When committing user contributions, make sure to credit them in your commit message with the user's full name and email address. Be aware and respectful -of their privacy: some users prefer to be only known by a -nickname. Take advantage of the tags such as Suggested-By or -Reported-By:when entering such information to the commit +of their privacy: some users prefer to be only known by a nickname. +Take advantage of tags such as Suggested-by: or +Reported-by: when entering such information to the commit message.
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: 95251a20ed3b8d7de99b355a6f02e9065bf8177a
Author: Wim Muskee gmail com>
AuthorDate: Fri Jan 3 08:46:31 2020 +
Commit: Göktürk Yüksek gentoo org>
CommitDate: Tue Jan 14 20:35:46 2020 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=95251a20
ebuild-maintenance/git: merge different references to #BUG-ID
Closes: https://github.com/gentoo/devmanual/pull/133
Signed-off-by: Wim Muskee gmail.com>
Signed-off-by: Göktürk Yüksek gentoo.org>
ebuild-maintenance/git/text.xml | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml
index 864036e..d58b35f 100644
--- a/ebuild-maintenance/git/text.xml
+++ b/ebuild-maintenance/git/text.xml
@@ -233,16 +233,16 @@ For packages where ${CATEGORY}/${PN}: is long, the
line length
limit can be exceeded, if absolutely necessary, to ensure a more
useful summary line. If a commit affects multiple directories, prepend
the message with which reflects the intention of the change best. If
-there are any bugs on Gentoo Bugzilla associated with the commit, id
+there are any bugs on Gentoo Bugzilla associated with the commit, the id
of the bug can be appended to the summary line using the format
-#BUG-ID. If you are modifying keywords, clearly state what
+#nn. If you are modifying keywords, clearly state what
keywords are added/removed.
By default, lines starting with # are considered to be comments
by git and not included in the commit message. Make sure that a new
-line does not start with #BUG-ID. Optionally, git can be
+line does not start with #nn. Optionally, git can be
configured to use a different character for comments by changing the
commentchar option.
@@ -285,12 +285,6 @@ automatically with reference to the commit.
as --force) for the commit.
-
-Additionally, some developers prefer referencing bugs on the summary
-line using the #nn form. Developers are free to use either
-form, or both simultaneously to combine their advantages.
-
-
When committing user
contributions, make sure to credit them in your commit message
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: fdc4594387073ec16b6021b1a858fffd5855d18a Author: Wim Muskee gmail com> AuthorDate: Wed Oct 23 19:19:10 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Tue Oct 29 20:30:21 2019 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=fdc45943 ebuild-maintenance/git: add sign-off for Certificate of Origin Bug: https://bugs.gentoo.org/668686 Closes: https://github.com/gentoo/devmanual.gentoo.org/pull/113 Acked-by: Michał Górny gentoo.org> Signed-off-by: Wim Muskee gmail.com> Signed-off-by: Göktürk Yüksek gentoo.org> ebuild-maintenance/git/text.xml | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml index c61589d..fb09de7 100644 --- a/ebuild-maintenance/git/text.xml +++ b/ebuild-maintenance/git/text.xml @@ -141,7 +141,11 @@ 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. +in the commit. Also when not using repoman, you must perform a manual sign-off +to the https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin;> +Certificate of Origin using the -s or --signoff option +with your git commit commands. Make sure you have read and understand the +actual Certificate. @@ -205,8 +209,9 @@ line. From the third line onward should be a detailed, multiline explanation of the changes introduced by the commit. At the very end, auxiliary information such as the bugs related to the commit, contributors, and reviewers should be listed using RFC822/git style -tags. The length of the lines in the message should be 70-75 -characters at maximum. +tags. The sign-off agreement will be added there as well when applied +with the commit action. The length of the lines in the message should +be 70-75 characters at maximum. @@ -310,6 +315,7 @@ new bar functionality introduced with this version. Bug: https://bugs.gentoo.org/0 Closes: https://bugs.gentoo.org/1 +Signed-off-by: Alice Bar a@example.org
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: 30c77a7b4c4beab3e93ab32756a2047c6e2d0d77 Author: Michał Górny gentoo org> AuthorDate: Sat Oct 14 18:27:48 2017 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Jan 3 04:38:30 2018 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=30c77a7b ebuild-maintenance/git: Add new section on repoman commit/full ebuild-maintenance/git/text.xml | 43 ++--- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml index 59f1833..dfc3d5b 100644 --- a/ebuild-maintenance/git/text.xml +++ b/ebuild-maintenance/git/text.xml @@ -112,12 +112,46 @@ the historical commits after the initial git commit. +Committing and verifying commits + + + +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. + + + +For any other use case, git commit and other git commands need to be +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. + + + +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. + + + + + + Git Commit Policy -Always run repoman scan before you commit. -Please run repoman full before you commit. Always test that package.mask is okay by doing emerge --pretend mypkg before you commit and check that it doesn't contain any conflicts. @@ -128,11 +162,6 @@ or that is masked, then first commit the revised package.mask and/o then commit the ebuild, patches and metadata.xml all in one go . - Although the set of changes in a single git commit is atomic, and -combining package.mask/license changes with ebuild changes in a -single commit wouldn't break atomicity, it is not currently possible to do so -using repoman commit. -
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: 5121332b708a733b2b52975a1100b847dcb0c60a Author: Michał Górny gentoo org> AuthorDate: Sat Oct 14 18:45:55 2017 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Jan 3 04:42:55 2018 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=5121332b ebuild-maintenance/git: Try to describe atomic commits better (GLEP 66) ebuild-maintenance/git/text.xml | 50 ++--- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml index dfc3d5b..c61589d 100644 --- a/ebuild-maintenance/git/text.xml +++ b/ebuild-maintenance/git/text.xml @@ -148,21 +148,45 @@ in the commit. -Git Commit Policy +Atomic commits - -Always test that package.mask is okay by doing -emerge --pretend mypkg before you commit and check -that it doesn't contain any conflicts. -Always commit the updated package.mask before -the updated package. -Always do atomic commits; if you commit a package with a new license, -or that is masked, then first commit the revised package.mask and/or license, -then commit the ebuild, patches -and metadata.xml all in one go -. - + +Whenever possible, use atomic commits. Try to split your changes into logical +commits, abiding by the following three rules as much as possible: + + + + +Do not include multiple irrelevant changes in a single commit. However, make +sure not to split relevant changes unnecessarily. For example, if a version bump +requires changes in the ebuild, it is correct to perform them in a single +commit. However, if you are fixing an additional bug that has been present +in the previous version, the fix belongs in a separate commit. + + + +Split commits at logical unit boundaries. When updating multiple packages, +preferably use a single commit for each package. Avoid combining changes +to ebuilds, eclasses, licenses, profiles etc. in a single commit. However, +do not split relevant or interdependent changes within a single package. + + + +Avoid creating commits introducing a temporary breakage. Unless impossible, +add packages in dependency install order. Add licenses before the packages +needing them. Commit package.mask and other profile changes before +ebuilds relying on them. Usually it is also acceptable to include those changes +along with the commit adding the package. + + + + +Please note that revision bumps count as side effects of the changes requiring +them and do not belong in separate commits. When doing multiple irrelevant +changes that require a revision bump, it is only necessary to bump the revision +in the first commit in the series introduced by a single push. +
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/, ebuild-maintenance/
commit: 9762a7e73d6c641bf879c5bf61fe0509a491acb8 Author: Michał Górny gentoo org> AuthorDate: Sat Oct 14 09:46:04 2017 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed Jan 3 01:25:19 2018 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=9762a7e7 ebuild-maintenance/git: Start a new section on git instructions ebuild-maintenance/git/text.xml | 16 ebuild-maintenance/text.xml | 1 + 2 files changed, 17 insertions(+) diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml new file mode 100644 index 000..172e22c --- /dev/null +++ b/ebuild-maintenance/git/text.xml @@ -0,0 +1,16 @@ + + + +Git for Gentoo Developers + + + +This guide covers git usage instructions and policies specific to Gentoo +ebuild development. It assumes that the readers possess basic git +knowledge. For a generic guide, please see the official +https://git-scm.com/book/;>git book. + + + + + diff --git a/ebuild-maintenance/text.xml b/ebuild-maintenance/text.xml index 46ab82f..f1f759d 100644 --- a/ebuild-maintenance/text.xml +++ b/ebuild-maintenance/text.xml @@ -17,5 +17,6 @@ This section covers various tasks related to working with ebuilds. +
[gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/git/
commit: 8f6095d523d5e36ddff1f089cf612fd5fe74e75a
Author: Michał Górny gentoo org>
AuthorDate: Sat Oct 14 10:18:42 2017 +
Commit: Göktürk Yüksek gentoo org>
CommitDate: Wed Jan 3 04:29:35 2018 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8f6095d5
ebuild-maintenance/git: Include instructions for setting up the checkout
ebuild-maintenance/git/text.xml | 102 ++--
1 file changed, 99 insertions(+), 3 deletions(-)
diff --git a/ebuild-maintenance/git/text.xml b/ebuild-maintenance/git/text.xml
index 172e22c..2070217 100644
--- a/ebuild-maintenance/git/text.xml
+++ b/ebuild-maintenance/git/text.xml
@@ -5,12 +5,108 @@
-This guide covers git usage instructions and policies specific to Gentoo
-ebuild development. It assumes that the readers possess basic git
-knowledge. For a generic guide, please see the official
+This guide covers git usage instructions and policies specific to Gentoo ebuild
+development. It assumes that the readers possess basic git knowledge.
+For a generic guide, please see the official
https://git-scm.com/book/;>git book.
+
+
+Preparing a development checkout
+
+
+
+Cloning the gentoo.git repository
+
+
+
+The ebuild development happens on the official git repository. You can push
+your changes only through the SSH protocol. Therefore, clone the repository
+using:
+
+
+
+git clone g...@git.gentoo.org:repo/gentoo.git
+
+
+
+If you do not have SSH access to the Gentoo git service, you can use the
anongit
+mirror for read-only access instead:
+
+
+
+git clone https://anongit.gentoo.org/git/repo/gentoo.git
+
+
+
+Normally git will fetch the complete history from the start of git repository
+(Aug 2015). This can require a significant amount of disk space. If you do not
+need the full history, you can use the --depth option to create a
shallow
+clone, including only a subset containing the the newest commits. For example,
+--depth=50 will include the 50 newest commits.
+
+
+
+Please note that git version 1.9 or newer is required to push when using
+a shallow clone.
+
+
+
+
+
+
+Configuration specific to the Gentoo repository
+
+
+
+To ensure that the Gentoo policies are followed, you should set the following
+configuration variables:
+
+
+
+git config --local user.name "${YOUR_FULL_NAME}"
+# use your @gentoo.org address even if you have a different default
+git config --local user.email "${YOUR_NICKNAME}@gentoo.org"
+
+# enable commit and push signing
+git config --local user.signingkey "0x${LONG_OPENPGP_KEY_ID}"
+git config --local commit.gpgsign 1
+git config --local push.gpgsign 1
+
+# prevent implicit merges on 'git pull'
+git config --local pull.ff only
+
+
+
+
+
+
+Grafting converted CVS history into the clone
+
+
+
+To include the converted CVS history in the git repository, you can
+graft it into the repository:
+
+
+
+git remote add history
https://anongit.gentoo.org/git/repo/gentoo/historical.git/
+git fetch history
+git replace --graft 56bd759df1d0c750a065b8c845e93d5dfa6b549d history/master
+
+
+
+Once this is done, git commands such as git log will include
+the historical commits after the initial git commit.
+
+
+
+
+
+
+
+
