From b3bde8847c1985e29225d6ddb32932342d29fb30 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 6 Jan 2017 14:22:20 -0800 Subject: [PATCH] CONTRIBUTING: Remove branch-naming suggestions Extending the earlier softening in 05483612 (CONTRIBUTING: Make leader-issues optional, 2016-05-19, #6), because nobody cares about the XXX- prefix. Checking the recent history of all OCI project repos: $ for REPO in image-spec image-tools runc runtime-spec runtime-tools; > do > ( > cd "${REPO} && > git fetch origin && > BRANCHES=$(git log --first-parent --oneline origin/master | sed 's/^.* from //') && > echo "${REPO} branches: $(echo "${BRANCHES}" | wc -l)" && > echo "${REPO} numbered: $(echo "${BRANCHES}" | grep '/[0-9]' | wc -l)" > ); > done image-spec branches: 276 image-spec numbered: 1 image-tools branches: 27 image-tools numbered: 0 runc branches: 1299 runc numbered: 21 runtime-spec branches: 391 runtime-spec numbered: 4 runtime-tools branches: 232 runtime-tools numbered: 3 Signed-off-by: W. Trevor King --- CONTRIBUTING.md | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0b17319..dc3ff6a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,16 +24,9 @@ incorporating a new feature. ### Conventions -Fork the repo and make changes on your fork in a feature branch: - -- If it's a bugfix branch, name it XXX-something where XXX is the number of the - issue -- If it's a feature branch, create an enhancement issue to announce your - intentions, and name it XXX-something where XXX is the number of the issue. - -Small changes or changes that have been discussed on the project mailing list -may be submitted without a leader issue, in which case you are free to name -your branch however you like. +Fork the repo and make changes on your fork in a feature branch. +For larger bugs and enhancements, consider filing a leader issue or mailing-list thread for discussion that is independent of the implementation. +Small changes or changes that have been discussed on the project mailing list may be submitted without a leader issue. If the project has a test suite, submit unit tests for your changes. Take a look at existing tests for inspiration. Run the full test suite on your branch