git apply --stat ISIS-xxx.patchIf a patch is received on a JIRA ticket, then it should be reviewed and applied. The commands are slightly different for diff files vs patch files.
If a diff file has been provided, then it can easily be applied using eGit’s wizards (Eclipse’s Git integration)…
| TODO - this stuff needs fleshing out … |
If a patch file has been provided, then it can be applied using command line tools.
First, take a look at what changes are in the patch. You can do this easily with git apply
git apply --stat ISIS-xxx.patchNote that this command does not apply the patch, but only shows you the stats about what it’ll do. After peeking into the patch file with your favorite editor, you can see what the actual changes are.
Next, you’re interested in how troublesome the patch is going to be. Git allows you to test the patch before you actually apply it.
git apply --check ISIS-xxx.patchIf you don’t get any errors, the patch has no conflicts. Otherwise you may see what trouble you’ll run into.
To apply a clean patch (adding the items and commit/signoff in a single step), use git am:
git am --signoff < ISIS-xxx.patchThis preserves the original author’s commit message.
However, this can fail if the patch file does not contain the original committers email address. In this case you will need to abort the am session:
git am abortand continue on by applying a non-clean patch, as described next.
If the patch does not apply cleanly, then the original authors commit message cannot be preserved. This sequence in this case is:
git apply ISIS-xxx.patchFix up any issues. The add and commit as usual
git add .
git commit -am "<original authors' commit message>" --signoffThe --signoff simply adds a line to the commit message indicating you have signed off the commit.
Information adapted from this blog post and this wiki page.