...
The ASF INFRA team maintains a mirror of our git repository over on GitHub.That mirror is strictly one-way: changes from the Apache git get copied over, but not the other way around. Further, the mirror on GitHub is read-only for everyone. Which means we can neither accept nor close pull requests filled there via the GitHub web UI. However, we want to allow for contributions via GitHub Pull Requests. Here's how:
...
Add the ASF git repository
Code Block | ||
---|---|---|
| ||
$ git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-reef.git |
As a result, you can refer to the ASF git as "apache". An example setup, with a the GitHub mirror at upstream and a forked GitHub origin at {username}:
Code Block | ||
---|---|---|
| ||
$ git remote -v apache https://git-wip-us.apache.org/repos/asf/incubator-reef.git (fetch) apache https://git-wip-us.apache.org/repos/asf/incubator-reef.git (push) origin https://github.com/{username}/incubator-reef.git (fetch) origin https://github.com/{username}/incubator-reef.git (push) upstream https://github.com/apache/incubator-reef.git (fetch) upstream https://github.com/apache/incubator-reef.git (push) |
Merge changes
The next step is to merge all changes on the Pull Request as a single commit. There are two methods here: (A) pull the branch from the GitHub Pull Request and squash commits, or (B) get the .diff
from GitHub and manually create a commit from this information. Each option has its pros and cons. With method A, git does some of the tedious work of preserving commit messages; but in some cases the squash may not apply cleanly, and the merger will have to carefully resolve conflicts. With method B, the .diff
will apply cleanly (given that the branch is up-to-date, i.e. the GitHub GUI states that the "This pull request can be automatically merged by project collaborators"); but the merger will have to carefully copy over commit messages and edit author information.
Commit Message
Whichever method you choose, the following should be included in the final commit message:
- Pull request description and commit comments
- A link to the JIRA this is addressing.
- The name and email of the original contributor (e.g., Contributed by John Doe <johndoe@apache.org>).
- The text "closes #PRNUMBER", where PRNUMBER is the number of the pull request, e.g. "10"
Following the last statement will close the GitHub pull request. It is important to close via the commit message, because we cannot close pull requests via the GitHub Web UI.
Method A
A-1. Create a branch on your local git repository
You want to make sure that that branch is current with the the master branch on Apache git:
...
This assumes that you called the remote git repository at the ASF "apache". You can name the branch however you want, but it is customary to name them either after the pull request number or the JIRA id, e.g. REEF-24.
A-2. Pull the contribution into that branch
This is as simple as
Code Block | ||
---|---|---|
| ||
$ git pull GIT_REPOSITORY_OF_THE_CONTRIBUTOR BRANCH_NAME_OF_THE_CONTRIBUTION |
...
This copies the changes from the given remote branch into the one we just created locally.
A-3. Check the pull request
- Make sure the code compiles and all tests pass.
- If the code touches code that you suspect might break on YARN or Mesos, please test on those environments. If you don't have access to a test environment, ask on the mailing list for help.
- Make sure the code adheres to our coding guidelines.
- Make sure that the additions don't create errors in a Apache RAT check via
mvn apache-rat:check
A-4. Rebase the branch onto current apache master
Code Block | ||
---|---|---|
| ||
# Make sure we have the latest bits $ git fetch apache # Rebase $ git rebase -i apache/master |
...
Chapter 3 and Chapter 7 of the Git Book contains lots of information on what this means.
Also, please Please make sure that the commit message contains :
- Pull request description and commit comments
- A link to the JIRA this is addressing.
- The name and email of the original contributor (e.g., Contributed by John Doe <johndoe@apache.org>).
- The text "closes #PRNUMBER", where PRNUMBER is the number of the pull request, e.g. "10"
Following the last statement will close the GitHub pull request. It is important to close via the commit message, because we cannot close pull requests via the GitHub Web UI.
the information given in "Commit Message" above. The latest commit can be changed at any time with the command:
Code Block | ||
---|---|---|
| ||
$ git commit --amend |
A-5. Push the code into apache's git
This is a good time to reflect back on this change and whether it is likely to break the build. If you are certain that it won't, go ahead and do:
Code Block | ||
---|---|---|
| ||
$ git checkout master
$ git merge BRANCH_NAME
$ git push apache master |
This pushes the current branch into the master branch hosted on Apache's git repository. From there, it will be mirrored onto GitHub. And by virtue of the comment added above to the commit message, GitHub will now close the Pull Request.
Method B
B-1. Update local master
In this method, you will work directly on your local master branch. Make sure you have the latest changes on your local master branch, by running:
Code Block | ||
---|---|---|
| ||
$ git pull apache master |
B-2. Download the .diff
and apply it
You can download the .diff
file by appending .diff
to the GitHub Pull Request url. This file will contain the exact changes that are shown in "Files changed" in the GitHub GUI. For example, for https://github.com/apache/incubator-reef/pull/24
the .diff
file is https://github.com/apache/incubator-reef/pull/24.diff
. Using this url, run apply:
Code Block | ||
---|---|---|
| ||
$ wget https://github.com/apache/incubator-reef/pull/24.diff
$ git apply 24.diff |
B-3. Commit and edit author information
Commit all files, making sure to include all modified and new files. In the commit message, make sure to include all information given in "Commit Message" above. After committing you must also change the author information to reflect the original author (and not yourself):
Code Block | ||
---|---|---|
| ||
$ git commit --amend --author "Original Author Name <email@address.com>" |
B-4. Push the code into apache's git
Now push your single commit to apache git:
Code Block | ||
---|---|---|
| ||
$ git push apache master |
This pushes the current branch into the master branch hosted on Apache's git repository. From there, it will be mirrored onto GitHub. And by virtue of the comment added above to the commit message, GitHub will now close the Pull Request.