1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
# 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.
```console
$ 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 git@github.com:$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](#format-of-the-commit-message) for details on commit best practices
and **supported prefixes**, e.g. `govc: <message>`.
### Example 1 - Fix a Bug in `vmw-guestinfo`
```console
$ 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`
```console
$ 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.
```console
$ 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):
```console
$ 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.
```console
$ 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:
```console
$ 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](https://github.com/golang/go/wiki/CodeReviewComments) 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](http://chris.beams.io/posts/git-commit/).
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.
|
