phpBB

Development Wiki

Difference between revisions of "Git"

From phpBB Development Wiki

(Moved to new dev docs.)
 
(56 intermediate revisions by 14 users not shown)
Line 1: Line 1:
This document provides details of the various repositories and branches available as part of the phpBB Git infrastructure, for details of how to use git please see [[Working with Git]].
+
This documentation has been moved.
  
= Commit Messages =
+
[https://area51.phpbb.com/docs/dev/31x/development/git.html phpBB Development Documentation: Git].
A good commit message looks like this:
+
 
+
[branch you are working on] A short explanation of the change.
+
+
A more detailed explanation of which things exactly were changed and for
+
what reasons. This can span multiple paragraphs for a bigger change. And
+
it should really make clear all the changes to anyone reading this commit
+
message without further context.
+
 
+
An example:
+
 
+
[feature/request-class] Adding a request class based on the one found in ascraeus-experiment.
+
+
The well known request_var function is now a wrapper that calls a method
+
on a phpbb_request object. The class provides additional functionality.
+
It can replace all super globals with special objects that throw errors
+
when being accessed. They still allow isset operations to keep backward
+
compatibility with isset($_POST['var']) checks. The phpbb_request class
+
implements the phpbb_request_interface which is available for easy mocking
+
of input in tests.
+
 
+
= phpBB4 =
+
== Repository ==
+
<pre>git://github.com/phpbb/phpbb.git</pre>
+
 
+
== Branches ==
+
 
+
* master - Development [http://github.com/phpbb/phpbb/tree/master View on GitHub]
+
 
+
Since phpBB 4 is still far from a stable version, there is only one development branch, in which all development takes place.
+
 
+
= phpBB3 =
+
== Repository ==
+
<pre>git://github.com/phpbb/phpbb3.git</pre>
+
 
+
== Branches ==
+
 
+
* master - Release [http://github.com/phpbb/phpbb3/tree/master View on GitHub]
+
* develop - Next feature release development [http://github.com/phpbb/phpbb3/tree/develop View on GitHub]
+
* develop-olympus - Olympus release maintenance [http://github.com/phpbb/phpbb3/tree/develop-olympus View on GitHub]
+
 
+
This means all bugfix development should take place on develop-olympus and will be merged into develop. All feature development should take place in develop.
+
 
+
= phpBB2 =
+
 
+
== Repository ==
+
<pre>git://github.com/phpbb/phpbb3.git</pre>
+
 
+
== Branches ==
+
 
+
* master-phpbb2 - Release [http://github.com/phpbb/phpbb3/tree/master-phpbb2 View on GitHub]
+
 
+
[[Category:Development]]
+

Latest revision as of 18:19, 5 December 2016

This documentation has been moved.

phpBB Development Documentation: Git.