| jfarrell | 347a5eb | 2014-04-05 12:20:07 -0400 | [diff] [blame] | 1 | ## Process used by committers to review and submit patches |
| 2 | |
| Konrad Grochowski | 3bc6424 | 2015-02-04 16:43:26 +0100 | [diff] [blame] | 3 | 1. Make sure that there is an issue for the patch(s) you are about to commit in our [Jira issue tracker](http://issues.apache.org/jira/browse/THRIFT) |
| 4 | |
| jfarrell | 347a5eb | 2014-04-05 12:20:07 -0400 | [diff] [blame] | 5 | 1. Check out the latest version of the source code |
| Konrad Grochowski | 3bc6424 | 2015-02-04 16:43:26 +0100 | [diff] [blame] | 6 | |
| Robert Lu | a139082 | 2018-12-27 23:57:35 +0800 | [diff] [blame] | 7 | * git clone https://github.com/apache/thrift.git thrift |
| jfarrell | 347a5eb | 2014-04-05 12:20:07 -0400 | [diff] [blame] | 8 | |
| 9 | 1. Apply the patch |
| Konrad Grochowski | 3bc6424 | 2015-02-04 16:43:26 +0100 | [diff] [blame] | 10 | |
| 11 | * curl https://issues.apache.org/jira/... |git apply --ignore-space-change |
| 12 | |
| 13 | or |
| 14 | |
| 15 | * curl https://github.com/<GitHub User>/thrift/commit/<Commit ID>.patch |git apply --ignore-space-change |
| 16 | |
| 17 | |
| jfarrell | 347a5eb | 2014-04-05 12:20:07 -0400 | [diff] [blame] | 18 | 1. Inspect the applied patch to ensure that all [Legal aspects on Submission of Contributions (Patches)](http://www.apache.org/licenses/LICENSE-2.0.html#contributions) are met |
| 19 | |
| 20 | 1. Run the necessary unit tests and cross language test cases to verify the patch |
| 21 | |
| 22 | 1. Commit the patch |
| 23 | |
| Konrad Grochowski | 3bc6424 | 2015-02-04 16:43:26 +0100 | [diff] [blame] | 24 | git --config user.name "Your Name" |
| 25 | git --config user.email "YourApacheID@apache.org" |
| 26 | git add -A |
| 27 | git commit |
| 28 | |
| jfarrell | 347a5eb | 2014-04-05 12:20:07 -0400 | [diff] [blame] | 29 | 1. The commit message should be in the format: |
| jfarrell | 347a5eb | 2014-04-05 12:20:07 -0400 | [diff] [blame] | 30 | |
| Jens Geyer | 2a95441 | 2019-09-22 11:04:07 +0200 | [diff] [blame] | 31 | THRIFT-####:<Jira description> |
| Konrad Grochowski | 3bc6424 | 2015-02-04 16:43:26 +0100 | [diff] [blame] | 32 | Client: <component> |
| 33 | Patch: <Name of person contributing the patch> |
| jfarrell | 347a5eb | 2014-04-05 12:20:07 -0400 | [diff] [blame] | 34 | |
| Konrad Grochowski | 3bc6424 | 2015-02-04 16:43:26 +0100 | [diff] [blame] | 35 | Description of what was fixed or addressed. |
| 36 | |
| Jens Geyer | 2a95441 | 2019-09-22 11:04:07 +0200 | [diff] [blame] | 37 | If this is a github pull request then add below comment to automaticaly close GitHub request, |
| 38 | where #NNNN is the PR number: |
| 39 | |
| 40 | This closes #NNNN |
| jfarrell | 347a5eb | 2014-04-05 12:20:07 -0400 | [diff] [blame] | 41 | |
| 42 | |
| 43 | 1. Double check the patch committed and that nothing was missed then push the patch |
| 44 | |
| Konrad Grochowski | 3bc6424 | 2015-02-04 16:43:26 +0100 | [diff] [blame] | 45 | git status |
| 46 | git show HEAD |
| 47 | git push origin master |
| jfarrell | 347a5eb | 2014-04-05 12:20:07 -0400 | [diff] [blame] | 48 | |
| Konrad Grochowski | 3bc6424 | 2015-02-04 16:43:26 +0100 | [diff] [blame] | 49 | |
| jfarrell | 347a5eb | 2014-04-05 12:20:07 -0400 | [diff] [blame] | 50 | 1. Resolve the jira issue and set the following for the changelog |
| 51 | |
| Konrad Grochowski | 3bc6424 | 2015-02-04 16:43:26 +0100 | [diff] [blame] | 52 | * Component the patch is for |
| 53 | * fixVersion to the current version on master |