User Tools

Site Tools


wiki:development:git

This is an old revision of the document!


X2go's Official GIT Repository

Within the X2go project development code is shared via a public GIT repository hosted by DAS-NETZWERKTEAM in Kiel, Nothern Germany (Servers: Hetzner Online AG). For any X2go GIT related questions, please contact our GIT repository administrator (currently: Mike Gabriel): git-admin (at) x2go (dot) org.

Access to X2go's GIT-Repository at BerliOS

Browse the X2go GIT repository tree in a webbrowser (either with GitWEB or with Chora/Horde-Framework):

The Web service is also available as a https service. To make secure browsing as smooth as possible, please import this Root-CA-Certificate into your web browser: http://das-netzwerkteam.de/NWT-ca.crt

Anonymous X2go GIT Repository Access via GIT protocol (read-only)

The X2go project's BerliOS Developer GIT repository can be checked out through anonymous GIT with the following instruction set (in a Unix-like console session).

$ mkdir -p ~/x2go
$ cd ~/x2go
$ git clone git://code.x2go.org/<package> 

For <package> names please refer to the GitWEB GUI (see above).

Contributing to X2go

Only project developers can access the GIT tree via the SSH method. Please understand that we only restrictively grant write access to our GIT repository. However, you can send us patches via Mail (git-send-email). For submitting X2go patches, please use this eMail address:

patches@x2go.org

Developer GIT Access via SSH

As an X2go developer, please substitute the field <developername> in the text below with your account login name. Substitute <package> with the X2go source package that you want to work on, substitute <branch> with the name of the branch of <package> you are contributing to. The SSH <port> to use for GIT write access will be provided to developers only and will not be named in this Wiki. Enter your code.x2go.org Git site password when prompted.

$ cd ~/x2go/<package>
$ git push ssh://<developername>@code.x2go.org:<port>/srv/git/code.x2go.org/<package> <branch>

SSH Key Fingerprints of code.x2go.org (fqdn: ymir.das-netzwerkteam.de)

RSA Key: ab:cd:4b:b2:d1:d1:19:11:ed:24:83:5a:06:b1:d4:d3

Commits / Tags via e-Mail

Commits and tags in X2go Git are posted as e-Mails to two different mailing lists:

These mailing lists can be subscribed to by anyone who is interested in X2go Git changes. However, beware that there might be phases you get flooded by mails, if you subscribe to any of these lists. Furthermore the lists are read-only. Postings to these lists will be dropped automatically by the mailing list service.

Objectives and Background Information

  • Our goal is to give the online community convenient access to our most recent work.
  • We have chosen a server location in Germany as one of our demands to the provider is that the GIT portal's WebGUI must not offend German laws regarding privacy protection.
  • We have chosen not to host the GIT ourselves, but have found a sponsor for hosting X2go GIT (http://das-netzwerkteam.de)
  • Community members can apply for a GIT branch in X2go's BerliOS GIT repository. The person who applies for a branch (please contact our GIT administrator, if you want to apply, for the contact mail see above) will further on be called the »branch owner«. Branch owners can gather people around them. However, the branch owner will be the only person that can push to the designated branch on the official X2go GIT server. Server access will be granted via SSH public/private key authentication.
  • The X2go team encourages you to form teams and work on your own branch and create your own blend of X2go. This will enable us all to cooperate and benefit from each others' work.

GIT Policies

On each GIT repositories (one GIT per source package) there are 2 permanent branches:

  • master branch
  • develop branch

An X2go release always means a merge from the develop branch to the master branch that then gets tagged with the upstream version number.

All X2go components that have been accepted for a future release can be found in the develop branch

There can be different temporary branches around release management:

  • release branches (release-<target-version>)
    • → branches off from develop branch
    • → merges into master branch
  • hotfix branches (hotfix-<target-version>)
    • → branches off from master branch
    • → merges back into master branch (and develop branch if needed)

And there can be different temporary branches around feature development. These branches we call feature branches:

  • feature branches (branch-<feature-name>)
    • → branches off from develop branch
    • → if feature gets accepted: merges back into develop branch

Further policies are:

  • Every GIT branch is readable by the public, there can be no private branches
  • The master branch is maintained by the X2go core development team (currently: Alex & Heinz)
  • The develop branch is maintained by the X2go core development team (currently: Alex & Heinz)
wiki/development/git.1296473875.txt.gz · Last modified: 2013/03/08 13:31 (external edit)