1==================== 2 Git Commit Rules 3==================== 4 5This is the first file you should be reading when contributing code via Git. 6We'll assume you're basically familiar with Git, but feel free to post 7your questions on the mailing list. Please have a look at 8http://git-scm.com/ for more detailed information on Git. 9 10PHP is developed through the efforts of a large number of people. 11Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following 12some basic rules with regards to Git usage will:: 13 14 a. Make everybody happier, especially those responsible for maintaining 15 PHP itself. 16 17 b. Keep the changes consistently well documented and easily trackable. 18 19 c. Prevent some of those 'Oops' moments. 20 21 d. Increase the general level of good will on planet Earth. 22 23Having said that, here are the organizational rules:: 24 25 1. Respect other people working on the project. 26 27 2. Discuss any significant changes on the list before committing and get 28 confirmation from the release manager for the given branch. 29 30 3. Look at EXTENSIONS file to see who is the primary maintainer of 31 the code you want to contribute to. 32 33 4. If you "strongly disagree" about something another person did, don't 34 start fighting publicly - take it up in private email. 35 36 5. If you don't know how to do something, ask first! 37 38 6. Test your changes before committing them. We mean it. Really. 39 To do so use "make test". 40 41 7. For development use the --enable-debug switch to avoid memory leaks 42 and the --enable-maintainer-zts switch to ensure your code handles 43 TSRM correctly and doesn't break for those who need that. 44 45Currently we have the following branches in use:: 46 47 master The active development branch. 48 49 PHP-7.1 Is used to release the PHP 7.1.x series. This is a prerelease 50 version. 51 52 PHP-7.0 Is used to release the PHP 7.0.x series. This is a current 53 stable version and is open for bugfixes only. 54 55 PHP-5.6 Is used to release the PHP 5.6.x series. This is a current 56 stable version and is open for bugfixes only. 57 58 PHP-5.5 This branch is closed. 59 60 PHP-5.4 This branch is closed. 61 62 PHP-5.3 This branch is closed. 63 64 PHP-5.2 This branch is closed. 65 66 PHP-5.1 This branch is closed. 67 68 PHP-4.4 This branch is closed. 69 70 PHP-X.Y.Z These branches are used for the release managers for tagging 71 the releases, hence they are closed to the general public. 72 73The next few rules are more of a technical nature:: 74 75 1. All changes should first go to the lowest branch (i.e. 5.6) and then 76 get merged up to all other branches. If a change is not needed for 77 later branches (i.e. fixes for features which where dropped from later 78 branches) an empty merge should be done. 79 80 2. All news updates intended for public viewing, such as new features, 81 bug fixes, improvements, etc., should go into the NEWS file of *any 82 stable release* version with the given change. In other words, 83 news about a bug fix which went into PHP-5.4, PHP-5.5 and master 84 should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but 85 not master, which is not a public released version yet. 86 87 3. Do not commit multiple files and dump all messages in one commit. If you 88 modified several unrelated files, commit each group separately and 89 provide a nice commit message for each one. See example below. 90 91 4. Do write your commit message in such a way that it makes sense even 92 without the corresponding diff. One should be able to look at it, and 93 immediately know what was modified. Definitely include the function name 94 in the message as shown below. 95 96 5. In your commit messages, keep each line shorter than 80 characters. And 97 try to align your lines vertically, if they wrap. It looks bad otherwise. 98 99 6. If you modified a function that is callable from PHP, prepend PHP to 100 the function name as shown below. 101 102 103The format of the commit messages is pretty simple. 104 105<max 79 characters short description>\n 106\n 107<long description, 79 chars per line> 108\n 109 110An Example from the git project (commit 2b34e486bc): 111 112pack-objects: Fix compilation with NO_PTHREDS 113 114It looks like commit 99fb6e04 (pack-objects: convert to use 115parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but 116hasn't noticed that the 'arg' variable no longer is available. 117 118If you fix some bugs, you should note the bug ID numbers in your 119commit message. Bug ID should be prefixed by "#" for easier access to 120bug report when developers are browsing CVS via LXR or Bonsai. 121 122Example: 123 124Fixed bug #14016 (pgsql notice handler double free crash bug.) 125 126When you change the NEWS file for a bug fix, then please keep the bugs 127sorted in decreasing order under the fixed version. 128 129You can use OpenGrok (http://lxr.php.net/) and gitweb (http://git.php.net/) 130to look at PHP Git repository in various ways. 131 132 133For further information on the process and further details please refer to 134https://wiki.php.net/vcs/gitworkflow and https://wiki.php.net/vcs/gitfaq 135 136Happy hacking, 137 138PHP Team 139
