]> git.proxmox.com Git - libgit2.git/blame - CONTRIBUTING.md
Merge pull request #3646 from pks-t/pks/xdiff-fix-from-upstream
[libgit2.git] / CONTRIBUTING.md
CommitLineData
41b00ccc
BS
1# Welcome to libgit2!
2
3We're making it easy to do interesting things with git, and we'd love to have
4your help.
5
dcfdb977
BS
6## Licensing
7
68a19ca9
RB
8By contributing to libgit2, you agree to release your contribution under
9the terms of the license. Except for the `examples` directory, all code
10is released under the [GPL v2 with linking exception](COPYING).
11
12The `examples` code is governed by the
13[CC0 Public Domain Dedication](examples/COPYING), so that you may copy
14from them into your own application.
dcfdb977 15
41b00ccc
BS
16## Discussion & Chat
17
ac63149c
WP
18We hang out in the
19[`#libgit2`](http://webchat.freenode.net/?channels=#libgit2)) channel on
20irc.freenode.net.
41b00ccc 21
1631147c
RB
22Also, feel free to open an
23[Issue](https://github.com/libgit2/libgit2/issues/new) to start a discussion
24about any concerns you have. We like to use Issues for that so there is an
25easily accessible permanent record of the conversation.
26
a142ed91
RB
27## Libgit2 Versions
28
29The `master` branch is the main branch where development happens.
30Releases are tagged
b247a39d 31(e.g. [v0.21.0](https://github.com/libgit2/libgit2/releases/tag/v0.21.0) )
a142ed91
RB
32and when a critical bug fix needs to be backported, it will be done on a
33`<tag>-maint` maintenance branch.
34
41b00ccc
BS
35## Reporting Bugs
36
1631147c
RB
37First, know which version of libgit2 your problem is in and include it in
38your bug report. This can either be a tag (e.g.
ac63149c
WP
39[v0.17.0](https://github.com/libgit2/libgit2/releases/tag/v0.17.0)) or a
40commit SHA
41(e.g. [01be7863](https://github.com/libgit2/libgit2/commit/01be7863)).
42Using [`git describe`](http://git-scm.com/docs/git-describe) is a
a142ed91 43great way to tell us what version you're working with.
1631147c 44
a142ed91 45If you're not running against the latest `master` branch version,
1631147c
RB
46please compile and test against that to avoid re-reporting an issue that's
47already been fixed.
41b00ccc 48
1631147c
RB
49It's *incredibly* helpful to be able to reproduce the problem. Please
50include a list of steps, a bit of code, and/or a zipped repository (if
51possible). Note that some of the libgit2 developers are employees of
52GitHub, so if your repository is private, find us on IRC and we'll figure
53out a way to help you.
41b00ccc
BS
54
55## Pull Requests
56
09846fd1
ET
57Our work flow is a [typical GitHub
58flow](https://guides.github.com/introduction/flow/index.html), where
59contributors fork the [libgit2 repository](https://github.com/libgit2/libgit2),
a142ed91 60make their changes on branch, and submit a
09846fd1
ET
61[Pull Request](https://help.github.com/articles/using-pull-requests)
62(a.k.a. "PR"). Pull requests should usually be targeted at the `master`
63branch.
41b00ccc 64
1631147c 65Life will be a lot easier for you (and us) if you follow this pattern
a142ed91
RB
66(i.e. fork, named branch, submit PR). If you use your fork's `master`
67branch directly, things can get messy.
68
69Please include a nice description of your changes when you submit your PR;
70if we have to read the whole diff to figure out why you're contributing
71in the first place, you're less likely to get feedback and have your change
72merged in.
73
74If you are starting to work on a particular area, feel free to submit a PR
75that highlights your work in progress (and note in the PR title that it's
76not ready to merge). These early PRs are welcome and will help in getting
77visibility for your fix, allow others to comment early on the changes and
78also let others know that you are currently working on something.
1631147c 79
a142ed91 80Before wrapping up a PR, you should be sure to:
41b00ccc 81
09846fd1 82* Write tests to cover any functional changes
a142ed91
RB
83* Update documentation for any changed public APIs
84* Add to the [`CHANGELOG.md`](CHANGELOG.md) file describing any major changes
6ca83665 85
09846fd1
ET
86## Unit Tests
87
88We believe that our unit tests allow us to keep the quality of libgit2
89high: any new changes must not cause unit test failures, and new changes
90should include unit tests that cover the bug fixes or new features.
91For bug fixes, we prefer unit tests that illustrate the failure before
92the change, but pass with your changes.
93
94In addition to new tests, please ensure that your changes do not cause
95any other test failures. Running the entire test suite is helpful
96before you submit a pull request. When you build libgit2, the test
97suite will also be built. You can run all tests by simply running
98the resultant `libgit2_clar` binary. If you want to run a specific
99unit test, you can name it with the `-s` option. For example:
100
101 libgit2_clar -sstatus::worktree::long_filenames
102
103Or you can run an entire class of tests. For example, to run all the
104worktree status tests:
105
106 libgit2_clar -sstatus::worktree
107
41b00ccc
BS
108## Porting Code From Other Open-Source Projects
109
1631147c
RB
110`libgit2` is licensed under the terms of the GPL v2 with a linking
111exception. Any code brought in must be compatible with those terms.
112
113The most common case is porting code from core Git. Git is a pure GPL
114project, which means that in order to port code to this project, we need the
115explicit permission of the author. Check the
41b00ccc 116[`git.git-authors`](https://github.com/libgit2/libgit2/blob/development/git.git-authors)
6ca83665 117file for authors who have already consented.
41b00ccc 118
1631147c
RB
119Other licenses have other requirements; check the license of the library
120you're porting code *from* to see what you need to do. As a general rule,
121MIT and BSD (3-clause) licenses are typically no problem. Apache 2.0
122license typically doesn't work due to GPL incompatibility.
41b00ccc 123
a142ed91
RB
124If your pull request uses code from core Git, another project, or code
125from a forum / Stack Overflow, then *please* flag this in your PR and make
126sure you've given proper credit to the original author in the code
127snippet.
6ca83665 128
1631147c 129## Style Guide
41b00ccc 130
68a19ca9
RB
131The public API of `libgit2` is [ANSI C](http://en.wikipedia.org/wiki/ANSI_C)
132(a.k.a. C89) compatible. Internally, `libgit2` is written using a portable
72556cc6 133subset of C99 - in order to compile with GCC, Clang, MSVC, etc., we keep
68a19ca9
RB
134local variable declarations at the tops of blocks only and avoid `//` style
135comments. Additionally, `libgit2` follows some extra conventions for
136function and type naming, code formatting, and testing.
1631147c
RB
137
138We like to keep the source code consistent and easy to read. Maintaining
139this takes some discipline, but it's been more than worth it. Take a look
09846fd1
ET
140at the [conventions
141file](https://github.com/libgit2/libgit2/blob/development/CONVENTIONS.md).
41b00ccc 142
1631147c
RB
143## Starter Projects
144
09846fd1
ET
145See our [projects
146list](https://github.com/libgit2/libgit2/blob/development/PROJECTS.md).