-# <a name="Git and gerrit for developers"></a> Git and gerrit for developers
+# <a href="http://www.tokobungasabana.com">Toko Bunga</a> gift for developers
Git opens up a number of new options for contributing to OpenAFS. For the first time, it is easy to review code that is pending addition to the OpenAFS tree. In fact, reviewing code is one of the best ways to ensure that the releases that OpenAFS ships remain stable and functional. If you are interested purely in reviewing, then please skip to that section towards the end of this document.
Git also changes the way that developers interact with the OpenAFS tree. Instead of just having a single version of the tree on your local machine, you have a compressed copy of the entire repository. Additionally, you no longer have to produce patches to send code upstream - any developer can push into the OpenAFS repository directly, through gerrit, our code review tool.
+* <a href="http://www.optimaweb.co.id/jasa-seo">Jasa SEO</a>
+* <a href="http://blogs.unpad.ac.id/dominodiaz/">Blog Kuliner</a>
+* <a href="http://adrian-fh98.web.unair.ac.id/">Adrian</a>
+
Whilst git is a far more powerful tool than CVS it is also, inevitably, more complex. This document can only scratch the surface of what's possible with git - there are many, many, documents available that describe git in greater detail, and references to some of them are provided at the end.
## <a name="Getting git"></a> Getting git
-Firstly, if your machine doesn't already have it installed, get a copy of the 'git' version control system. This is available for many platforms from their upstream package repositories or, failing that, can be downloaded in both source and binary form from <http://git-scm.com/download>
+Firstly, if your machine doesn't already have it installed, get a copy of the 'git' version control system. This is available for many platforms from their upstream package repositories or, failing that, can be downloaded in both source and binary form from
## <a name="Getting the _OpenAFS repository"></a> Getting the OpenAFS repository
If you plan on making changes to OpenAFS (and why else would you be reading this?) you should probably also grab <b>The change id hook</b> described in <b>Registering With gerrit</b> below. You can grab and apply the hook before registering, and it'll make sure your pre-registration development has the appropriate change IDs in the log. The hook only applies to your openafs development, so you're not going to mess up any of your non-OpenAFS work.
+## <a name="Helpful git tips"></a> Helpful git tips
+
+Here are a few other git settings that may be helpful when working with the source.
+
+Prevent C labels from being treated as function names by git diff:
+
+ git config diff.default.xfuncname '^[[:alpha:]$_].*[^:]$'
+
+Changes the style used to indicate merge conflicts in source files:
+
+ git config merge.conflictstyle diff3
+
+Whitespace handling settings:
+
+ git config apply.whitespace fix
+ git config core.whitespace trailing-space,space-before-tab,indent-with-non-tab
+ git config config.cleanup whitespace
+
## <a name="Starting development"></a> Starting development
We strongly recommend that you do all of your development upon 'topic branches' This allows you to isolate multiple unrelated changes, and makes it easier to keep your tree in sync with the upstream [[OpenAFS]] one.
Thirdly, each commit should have a valid changeID. Manually maintaining these is difficult and error prone, so we would strong advise that you install the changeID hook detailed earlier. This will automatically add a [[ChangeId]] line to your commit message if it doesn't already contain one.
-Once you have commits in this form, use
+Coffres-forts et armoires fortes pour la sécurité
+Afin de sécuriser efficacement les biens, liquidité, bijoux et les données informatiques contre le vol et contre le risque d'incendie, il est indispensable de faire installer un coffre-fort ignifuge homologué et un coffret à clés.
+Les faits divers des journaux relatent d'histoires de cambriolages plus ou moins graves. Un coffre-fort certifié A2P est actuellement la meilleur protection pour vos bijoux et autres objets de valeur sentimentale qui vous sont chers.
+Le site <http://www.infosafe.fr> propose une gamme exceptionnelle de mobilier de sécurité, allant du coffre fort A2P au coffre fort ignifuge ou encore de l'armoire forte et de l'[armoire forte anti feu](http://www.infosafe.fr/Armoirefortedin/Armoirefortedin.htm) qui couvriront les besoins de sécurité qui sont actuellement nécessaire à votre sérénité.
+
+
+Fourthly, each commit must adhere to the OpenAFS whitespace policy whereby new commits will not be accepted if they have trailing spaces, spaces before tabs, or indentation without tabs. Git can be configured to highlight the whitespace policy violation with the following global setting:
+
+ git config --global core.whitespace trailing-space,space-before-tab,indent-with-non-tab
+
+and
+
+ git rebase --whitespace=fix
+
+can be used to automatically fix any policy violations on your local branch before pushing the changes to Gerrit. Finally, Git 1.8.2 and above can be configured to apply this policy to all local commits:
+
+ git config --global config.cleanup whitespace
+
+Once your commits have a proper commit message and have all whitespace errors fixed, use
git log -p origin/<branch>..HEAD
(where <branch> is the upstream branch upon which you are basing this patch).
-to check that what you're giving us makes sense. Then, upload them to gerrit using
+to check that what you're giving us makes sense. Then, upload the commits to gerrit using
+
+ git push ssh://gerrit.openafs.org/openafs.git HEAD:refs/for/<branch>/<topic>
+
+(again <branch> is the name of the upstream branch that you are pushing the changes into, not the name of any local branch you may have been developing on and <topic> is an optional name that can be used to group your commits together for easier reviewing.)
- git push ssh://gerrit.openafs.org/openafs.git HEAD:refs/for/<branch>
+In this case, refs/for is a literal string. So, if you had been developing against the "master" branch and the change replaced "strcpy" with "strlcpy", you might upload your changes with:
-(again <branch> is the name of the upstream branch that you are pushing the changes into, not the name of any local branch you may have been developing on)
+ git push ssh://gerrit.openafs.org/openafs.git HEAD:refs/for/master/strcpy-to-strlcpy
-In this case, refs/for is a literal string. So, if you had been developing against master, you can upload your changes with:
+Although, it would be sufficient to simply issue the command as:
git push ssh://gerrit.openafs.org/openafs.git HEAD:refs/for/master
(assuming your patch is against the 'master' git branch, and lives on the <topic> branch)
-And then simply resubmit your change in the same way as if you had been asked to revise it (see notes above)
+When a rebase is performed there may be conflicts that cannot be automatically resolved by git. The default style of conflict resolution displays the current version of the code on HEAD and the version from the commit that is being rebased. This level of detail is often insufficient to determine how to resolve the conflict. Switching to conflict style "diff3" will also show the original version of the code which your commit modified. Turn on "diff3" by applying the following configuration setting:
+
+ git config --global merge.conflictstyle diff3
+
+After you have resolved all conflicts and are once again happy with the commit, simply resubmit your change in the same way as if you had been asked to revise it (see notes above)
## <a name="Submitting by patch"></a> Submitting by patch
will give all of the changes between the branch point of you topic branch (assuming you branched from 'master') and the last commit.
-You can send those into <openafs-bugs@openafs.org> as before. Note, however, by doing this you're making someone else take the patch, create a topic branch in their local tree, apply the patch, and push it into gerrit. Things would be much more efficient if you pushed into gerrit yourself. Please?
+A better approach is to generate a patch file. To do so commit your changes to a local branch in your repository as you would if you were submitting to gerrit. If your changes are against the "master" branch, instead of pushing the patch execute the command:
+
+ git format-patch origin/master..HEAD
+
+For each commit on your local branch after the most recent patch on "master", a separate patch file will be generated.
+
+Regardless of which approach you use, you can e-mail the changes to <openafs-bugs@openafs.org> as before. Note, however, by doing this you're making someone else take the patch, create a topic branch in their local tree, apply the patch, push it into gerrit, and become responsible for managing the review process. Things would be much more efficient if you pushed into gerrit yourself. Please?
## <a name="Reviewing changes"></a> Reviewing changes
We'll now look at how changes that have made it into gerrit can be reviewed. All code review now happens via the <http://gerrit.openafs.org> interface. You should log in there as detailed above (using any OpenID), and make sure that the email address points to somewhere you'll read regularly.
-You'll be presented with a list of patches requiring review or, if someone has asked, patches you've been explicitly requested to review. There are two types of review - Code Review and Verification. Code Review means that you have read through the code, and are satisified that it works properly, follows the tree's style, and generally doesn't suck. Verification means that you have taken a copy of the patch and tested it. We hope to eventually automate the verification step, but for now both must be perfomed by hand.
+You'll be presented with a list of patches requiring review or, if someone has asked, patches you've been explicitly requested to review. There are two types of review - Code Review and Verification. Code Review means that you have read through the code, and are satisfied that it works properly, follows the tree's style, and generally doesn't suck. Verification means that you have taken a copy of the patch and tested it. We hope to eventually automate the verification step, but for now both must be performed by hand.
To perform a code review, go through each of the diffs in the current changeset for the code you have decided to review. You can double click on a line to leave a comment. Once you have completed commenting, click on the 'Review' button that's about 3/4 of the way down the page containing the list of patch sets. You will then be asked to score the patch, with a range from -1 to +1. -1 means that you don't think the code should be applied, +1 means that it is good to apply. You can also leave further, general, comments for the patch submitter.
Gerrit Documentation <http://gerrit.googlecode.com/svn/documentation/2.0/index.html> (only the first 'User Guide' section of this document is relevant)
+Five advanced Git merge techniques <http://blog.ezyang.com/2010/01/advanced-git-merge/>
+
## <a name="Acknowledgments"></a> Acknowledgments
Thanks to everyone who has reviewed this document, and offered corrections and contributions.
git://git.openafs.org / openafs-wiki.git / blobdiff