Fixed typo

[TortoiseGit.git] / doc / HowToContribute.txt

Checklist (and a short version for the impatient):\r
\r
        Commits:\r
\r
        - make commits of (small) logical units\r
        - check for unnecessary whitespace with "git diff --check"\r
          before committing\r
        - do not check in commented out code or unneeded files\r
        - the first line of the commit message should be a short\r
          description and should skip the full stop. If it is about a\r
          bugreport/issue, prepend "Fixed issue #NUMBER: " to the subject.\r
        - the body should provide a meaningful commit message, which:\r
          . explains the problem the change tries to solve, iow, what\r
            is wrong with the current code without the change.\r
          . justifies the way the change solves the problem, iow, why\r
            the result with the change is better.\r
          . alternate solutions considered but discarded, if any.\r
        - describe changes in imperative mood, e.g. "make xyzzy do frotz"\r
          instead of "[This patch] makes xyzzy do frotz" or "[I] changed\r
          xyzzy to do frotz", as if you are giving orders to the codebase\r
          to change its behaviour.\r
        - try to make sure your explanation can be understood without\r
          external resources. Instead of giving a URL to a mailing list\r
          archive, summarize the relevant points of the discussion.\r
        - add a "Signed-off-by: Your Name <you@example.com>" line to the\r
          commit message (or just use the option "-s" when committing)\r
          to confirm that you agree to the Developer's Certificate of Origin\r
\r
        Submission:\r
        \r
        - open an issue on http://code.google.com/p/tortoisegit/ or go to an\r
          issue you want to fix. Then you have one of the following options:\r
          . attach a patch there\r
          . provide a link to a branch you want the maintainers to pull from\r
          . open a github pull request and put the link into the issue\r
\r
Longer version:\r
\r
(0) Make separate commits for logically separate changes.\r
\r
Unless your patch is really trivial, you should not be sending\r
out a patch that was generated between your working tree and\r
your commit head.  Instead, always make a commit with complete\r
commit message and generate a series of patches from your\r
repository.\r
\r
Give an explanation for the change(s) that is detailed enough so\r
that people can judge if it is good thing to do, without reading\r
the actual patch text to determine how well the code does what\r
the explanation promises to do.\r
\r
If your description starts to get too long, that's a sign that you\r
probably need to split up your commit to finer grained pieces.\r
That being said, patches which plainly describe the things that\r
help reviewers check the patch, and future maintainers understand\r
the code, are the most beautiful patches.  Descriptions that summarise\r
the point in the subject well, and describe the motivation for the\r
change, the approach taken by the change, and if relevant how this\r
differs substantially from the prior version, are all good things\r
to have.\r
\r
Oh, another thing. We are picky about whitespaces. To help ensure this\r
does not happen, run git diff --check on your changes before you commit.\r
\r
\r
(1a) Generate your patch using git tools out of your commits (Patch serial)\r
\r
git based diff tools generate unidiff which is the preferred format.\r
\r
Please make sure your patch does not include any extra files\r
which do not belong in a patch submission.  Make sure to review\r
your patch after generating it, to ensure accuracy.  Before\r
sending out, please make sure it cleanly applies to the "master"\r
branch head.\r
\r
\r
(1b) Create a pull request\r
\r
Push your changes to a public repository. Use a brief branch name\r
describing your changes.\r
\r
Please make sure your pull request does not include any extra files\r
which do not belong in a submission.  Make sure to review your patch\r
after generating it, to ensure accuracy.\r
\r
There is no need to generate a "formal" pull request. The URL and\r
branchname is necessary - or create a github pull request\r
(https://github.com/TortoiseGit).\r
\r
\r
(2) Sign your work\r
\r
To improve tracking of who did what, we've borrowed the\r
"sign-off" procedure from the Linux kernel project on patches\r
that are being emailed around.  Although TortoiseGit is a lot\r
smaller project it is a good discipline to follow it.\r
\r
The sign-off is a simple line at the end of the explanation for\r
the patch, which certifies that you wrote it or otherwise have\r
the right to pass it on as a open-source patch.  The rules are\r
pretty simple: if you can certify the below:\r
\r
        Developer's Certificate of Origin 1.1\r
\r
        By making a contribution to this project, I certify that:\r
\r
        (a) The contribution was created in whole or in part by me and I\r
            have the right to submit it under the open source license\r
            indicated in the file; or\r
\r
        (b) The contribution is based upon previous work that, to the best\r
            of my knowledge, is covered under an appropriate open source\r
            license and I have the right under that license to submit that\r
            work with modifications, whether created in whole or in part\r
            by me, under the same open source license (unless I am\r
            permitted to submit under a different license), as indicated\r
            in the file; or\r
\r
        (c) The contribution was provided directly to me by some other\r
            person who certified (a), (b) or (c) and I have not modified\r
            it.\r
\r
        (d) I understand and agree that this project and the contribution\r
            are public and that a record of the contribution (including all\r
            personal information I submit with it, including my sign-off) is\r
            maintained indefinitely and may be redistributed consistent with\r
            this project or the open source license(s) involved.\r
\r
then you just add a line saying\r
\r
        Signed-off-by: Random J Developer <random@developer.example.org>\r
\r
This line can be automatically added by Git and TortoiseGit.\r
\r
Also notice that a real name is used in the Signed-off-by: line. Please\r
don't hide your real name.\r
\r
If you like, you can put extra tags at the end:\r
\r
1. "Reported-by:" is used to credit someone who found the bug that\r
   the patch attempts to fix.\r
2. "Acked-by:" says that the person who is more familiar with the area\r
   the patch attempts to modify liked the patch.\r
3. "Reviewed-by:", unlike the other tags, can only be offered by the\r
   reviewer and means that she is completely satisfied that the patch\r
   is ready for application.  It is usually offered only after a\r
   detailed review.\r
4. "Tested-by:" is used to indicate that the person applied the patch\r
   and found it to have the desired effect.\r
\r
You can also create your own tag or use one that's in common usage\r
such as "Thanks-to:", "Based-on-patch-by:", or "Mentored-by:".\r
\r
------------------------------------------------\r
An ideal patch flow\r
\r
Here is an ideal patch flow for this project the current maintainer\r
suggests to the contributors:\r
\r
 (0) You come up with an itch.  You code it up.\r
\r
 (1) Open an issue on http://code.google.com/p/tortoisegit/ or attach\r
     your changes to another already reported issue. Attach the patches\r
     or provide a pull request (URL branch) there.\r
\r
 (2) You get comments and suggestions for improvements.  You may\r
     even get them in a "on top of your change" patch form.\r
\r
 (3) Polish, refine, and re-send.  Go back to step (2).\r
\r
 (4) The patch will be applied to master.\r