Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Latest commit

 

History

History
135 lines (97 loc) · 3.93 KB

CONTRIBUTING.md

File metadata and controls

135 lines (97 loc) · 3.93 KB
Raw

Contributing to vmw-guestinfo

Getting started

First, fork the repository on GitHub to your personal account.

Note that GOPATH can be any directory, the example below uses $HOME/vmw-guestinfo. Change $USER below to your Github username if they are not the same.

$ export GOPATH=$HOME/vmw-guestinfo
$ go get github.com/vmware/vmw-guestinfo

$ cd $GOPATH/src/github.com/vmware/vmw-guestinfo
$ git config push.default nothing # anything to avoid pushing to vmware/vmw-guestinfo by default
$ git remote rename origin vmware
$ git remote add $USER [email protected]:$USER/vmw-guestinfo.git
$ git fetch $USER

Contribution Flow

This is a rough outline of what a contributor's workflow looks like:

  • Create an issue describing the feature/fix
  • Create a topic branch from where you want to base your work.
  • Make commits of logical units.
  • Make sure your commit messages are in the proper format (see below).
  • Push your changes to a topic branch in your fork of the repository.
  • Submit a pull request to vmware/vmw-guestinfo.

See below for details on commit best practices and supported prefixes, e.g. govc: <message>.

Example 1 - Fix a Bug in vmw-guestinfo

$ git checkout -b issue-<number> vmware/master
$ git add <files>
$ git commit -m "fix: ..." -m "Closes: #<issue-number>"
$ git push $USER issue-<number>

Example 2 - Add a new (non-breaking) API to vmw-guestinfo

$ git checkout -b issue-<number> vmware/master
$ git add <files>
$ git commit -m "Add API ..." -m "Closes: #<issue-number>"
$ git push $USER issue-<number>

Example 3 - Document Breaking (API) Changes

Breaking changes, e.g. to the vmw-guestinfo APIs, are highlighted in the CHANGELOG and release notes when the keyword BREAKING: is used in the commit message body.

The text after BREAKING: is used in the corresponding highlighted section. Thus these details should be stated at the body of the commit message. Multi-line strings are supported.

$ git checkout -b issue-<number> vmware/master
$ git add <files>
$ cat << EOF | git commit -F -
Add ctx to funcXYZ

This commit introduces context.Context to function XYZ
Closes: #1234

BREAKING: Add ctx to funcXYZ()
EOF

$ git push $USER issue-<number>

Stay in sync with Upstream

When your branch gets out of sync with the vmware/master branch, use the following to update (rebase):

$ git checkout issue-<number>
$ git fetch -a
$ git rebase vmware/master
$ git push --force-with-lease $USER issue-<number>

Updating Pull Requests

If your PR fails to pass CI or needs changes based on code review, you'll most likely want to squash these changes into existing commits.

If your pull request contains a single commit or your changes are related to the most recent commit, you can simply amend the commit.

$ git add .
$ git commit --amend
$ git push --force-with-lease $USER issue-<number>

If you need to squash changes into an earlier commit, you can use:

$ git add .
$ git commit --fixup <commit>
$ git rebase -i --autosquash vmware/master
$ git push --force-with-lease $USER issue-<number>

Be sure to add a comment to the PR indicating your new changes are ready to review, as Github does not generate a notification when you git push.

Code Style

The coding style suggested by the Go community is used in vmw-guestinfo. See the style doc for details.

Try to limit column width to 120 characters for both code and markdown documents such as this one.

Format of the Commit Message

We follow the conventions described in How to Write a Git Commit Message.

Be sure to include any related GitHub issue references in the commit message, e.g. Closes: #<number>.

Reporting Bugs and Creating Issues

When opening a new issue, try to roughly follow the commit message format conventions above.