Git For Garage

(New page: == Overview == The purpose of this page is to describe details of the "Git for [http://garage.maemo.org garage]" that is being started at the beginning of December, 2008. == Background =...)
(Undo revision 45999 by 114.79.28.10 (Talk) vandalism/spam)
 
(28 intermediate revisions not shown)
Line 1: Line 1:
-
== Overview ==
+
[http://git-scm.com/ Git] is available as an alternative version control system to [[Subversion]] for [[Getting started with Maemo Garage|Garage]] projects.
-
The purpose of this page is to describe details of the "Git for [http://garage.maemo.org garage]" that is being started at the beginning of December, 2008.
+
== Requesting Git for your Garage project ==
-
== Background ==  
+
=== New Projects ===
-
Garage have been a successful hosting environment for maemo projects since [http://test.maemo.org/#date_25052006 2006]. The tool that powers garage is [http://gforge.org/ GForge] with [https://garage.maemo.org/projects/garage some modifications] done by the maemo team. Software projects coming to garage can only use one source code revision control system, that is [http://subversion.tigris.org/ subversion, aka svn].
+
When you start a new project at garage you can select "git" to be the default version control system. At the bottom of the request form you can pick between "svn" and "git". Your new project will automatically have a "git" repository.
-
Ever since the [http://kernel.org Linux kernel] is maintained by [http://git.or.cz/ git] we had been asked to offer git for garage projects as well. The time has finally came and we are now developing the changes.  
+
-
The [http://gforge.com GForge team] has developed a [http://gforge.com/gf/project/scmgit/ git plugin] which provides the functionality we are trying to achieve, but their plugin is meant for the [http://gforgegroup.com/es/ Advanced Server edition] of GForge. GForge AS is not in line (both code- and license wise) with the [http://gforge.org/projects/gforge/ open source version] we have at garage. Therefore we decided to write a free plugin for garage, which could be used by on any GForge 4.5.20+ installations.
+
=== Old Project Can Request Conversion ===
-
== Plans ==
+
This feature has not been advertized, but it is possible to convert an existing subversion repository to a "git" repo. All you need to do is to go to the "Admin" page of your project's SCM section and click the "Convert to git repository" button.
 +
 
 +
Your request will be scheduled and you can monitor the progress through a link that will be shown to you as soon as you hit the button.
 +
 
 +
The conversion works the best (tm) with svn repositories that have "standard layout". Standard layout means that the root of the subversion repo has:
 +
 
 +
-trunk
 +
 
 +
-branches
 +
 
 +
-tags
 +
 
 +
Branches and tags will be converted to proper git branches, while trunk will be the master branch.
 +
 
 +
If your project has a 'www' directory in its root, then it is also supposed to be converted.
 +
 
 +
Conversion also works for repositories that do not have the standard layout. However this features was just recently introduced, so bugs might surface.
 +
 
 +
If the conversion was OK, then your subversion repo will be disabled, meaning that no further can commits can go into it. However it will remain safe on our servers and if you remember the URL than you can even read it.
 +
 
 +
If you are unhappy with the result of the conversion then please request to restore it. We will revert your svn repository just like it was at the time of your conversion request.
 +
 
 +
If the conversion FAILED, then the system will not do any changes to your project settings and your svn repo remains usable.
 +
 
 +
In case you have questions, feedback or experience problems please report them through bugzilla, or just send an email to "garage at maemo dot org".
 +
 
 +
== Garage-specific information ==
 +
 
 +
Git on Garage uses the https access method via cURL (most Git installations use Git over ssh, and this is currently under development for Garage). This may cause problems due to the security certificate on https://vcs.maemo.org, so if you experience any issues with 'git clone' or 'git push' please try to set the <code>GIT_SSL_NO_VERIFY</code> environment variable to 1, for example:
 +
export GIT_SSL_NO_VERIFY=1
 +
in a terminal on Linux using bash.
 +
 
 +
For proxy users, the <code>https_proxy</code> environment variable must be set, for example:
 +
export https_proxy="172.21.112.250:8080"
 +
 
 +
To authenticate, make sure you have filled in your Garage credentials to ~/.netrc, for example:
 +
machine vcs.maemo.org
 +
login __garage user name__
 +
password __garage password__
 +
 
 +
== Additional info ==
 +
 
 +
The information on the Garage SCM page for Git projects seems incorrect or incomplete. If you want to push you will need to specify:
 +
 
 +
<code><nowiki>https://<garage username>@vcs.maemo.org/git/<project name></nowiki></code>...as the URL of the repository.
 +
 
 +
== Further reading ==
 +
 
 +
* [http://git-scm.com/documentation Git documentation] at the Git homepage
 +
* [http://git.or.cz/course/svn.html Subversion to Git documentation] for users familiar with Subversion but new to Git
 +
* See the [[Git for Garage wishlist]]
 +
 
 +
[[Category:Community]]
 +
[[Category:Development]]

Latest revision as of 06:28, 15 December 2011

Git is available as an alternative version control system to Subversion for Garage projects.

Contents

[edit] Requesting Git for your Garage project

[edit] New Projects

When you start a new project at garage you can select "git" to be the default version control system. At the bottom of the request form you can pick between "svn" and "git". Your new project will automatically have a "git" repository.

[edit] Old Project Can Request Conversion

This feature has not been advertized, but it is possible to convert an existing subversion repository to a "git" repo. All you need to do is to go to the "Admin" page of your project's SCM section and click the "Convert to git repository" button.

Your request will be scheduled and you can monitor the progress through a link that will be shown to you as soon as you hit the button.

The conversion works the best (tm) with svn repositories that have "standard layout". Standard layout means that the root of the subversion repo has:

-trunk

-branches

-tags

Branches and tags will be converted to proper git branches, while trunk will be the master branch.

If your project has a 'www' directory in its root, then it is also supposed to be converted.

Conversion also works for repositories that do not have the standard layout. However this features was just recently introduced, so bugs might surface.

If the conversion was OK, then your subversion repo will be disabled, meaning that no further can commits can go into it. However it will remain safe on our servers and if you remember the URL than you can even read it.

If you are unhappy with the result of the conversion then please request to restore it. We will revert your svn repository just like it was at the time of your conversion request.

If the conversion FAILED, then the system will not do any changes to your project settings and your svn repo remains usable.

In case you have questions, feedback or experience problems please report them through bugzilla, or just send an email to "garage at maemo dot org".

[edit] Garage-specific information

Git on Garage uses the https access method via cURL (most Git installations use Git over ssh, and this is currently under development for Garage). This may cause problems due to the security certificate on https://vcs.maemo.org, so if you experience any issues with 'git clone' or 'git push' please try to set the GIT_SSL_NO_VERIFY environment variable to 1, for example: 

export GIT_SSL_NO_VERIFY=1

in a terminal on Linux using bash.

For proxy users, the https_proxy environment variable must be set, for example: 

export https_proxy="172.21.112.250:8080"

To authenticate, make sure you have filled in your Garage credentials to ~/.netrc, for example: 

machine vcs.maemo.org
login __garage user name__
password __garage password__

[edit] Additional info

The information on the Garage SCM page for Git projects seems incorrect or incomplete. If you want to push you will need to specify:

https://<garage username>@vcs.maemo.org/git/<project name>...as the URL of the repository.

[edit] Further reading

Retrieved from "http://wiki.maemo.org/Git_For_Garage"