This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
wiki:development:git [2013/01/10 14:45] kjellski [Checkout all repos:] |
wiki:development:git [2020/05/28 22:43] (current) danger89 [Anonymous X2Go Git Repository Access via Git-protocol (read-only)] |
||
---|---|---|---|
Line 1: | Line 1: | ||
====== X2Go's Git Repository ====== | ====== X2Go's 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 technical X2Go GIT related questions, please contact our GIT repository administrator (currently: Mike Gabriel): '' | + | 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 technical X2Go Git related questions, please contact our Git repository administrator (currently: Mike Gabriel): '' |
===== Access ===== | ===== Access ===== | ||
Line 17: | Line 17: | ||
X2Go's Git projects can be cloned to a local copy through anonymous Git with the following instruction set (in a Unix-like console session). | X2Go's Git projects can be cloned to a local copy through anonymous Git with the following instruction set (in a Unix-like console session). | ||
- | $ mkdir -p ~/x2go | + | $ mkdir ~/ |
- | $ cd ~/x2go | + | $ git clone git:// |
- | $ git clone git:// | + | |
- | For <package> names please refer to the [[http:// | + | For the <package_name> please refer to the [[http:// |
===== Contributing to X2Go ===== | ===== Contributing to X2Go ===== | ||
Line 27: | Line 26: | ||
Before you start contributing make sure git git knows who you are, as this is added to the patches. | Before you start contributing make sure git git knows who you are, as this is added to the patches. | ||
- | === Setup Git Configuration === | + | ==== Setup Git Configuration |
Now it is time to set up your system environment for working with Git. Main thing is to tell Git who you are. For this edit the file '' | Now it is time to set up your system environment for working with Git. Main thing is to tell Git who you are. For this edit the file '' | ||
Line 37: | Line 36: | ||
</ | </ | ||
+ | ==== Sending in Patches ==== | ||
+ | Only project developers can access X2Go's 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 the [[wiki: | ||
- | Only project developers can access X2Go's 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: | ||
- | < | + | ==== Developer Git Access via SSH ==== |
- | + | ||
- | patches@x2go.org | + | |
- | + | ||
- | === Developer Git Access via SSH === | + | |
Line 53: | Line 49: | ||
$ git push ssh:// | $ git push ssh:// | ||
- | === SSH Key Fingerprints of code.x2go.org (FQDN: ymir.das-netzwerkteam.de) === | + | ==== SSH Key Fingerprints of code.x2go.org (FQDN: ymir.das-netzwerkteam.de) |
| | ||
Line 62: | Line 58: | ||
Commits and tags in X2Go Git are posted as e-Mails to two different mailing lists: | Commits and tags in X2Go Git are posted as e-Mails to two different mailing lists: | ||
- | * Git commits -> x2go-commits@lists.berlios.de (https:// | + | * Git commits -> x2go-commits@lists.x2go.org (https:// |
- | * Git tags -> x2go-announcement@lists.berlios.de (https:// | + | * Git tags -> x2go-tags@lists.x2go.org (https:// |
- | 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 (esp. x2go-commits). Furthermore the lists are read-only. Postings to these lists will be dropped automatically by the mailing list service. | + | These mailing lists can be subscribed to by anyone who is interested in X2Go Git changes. However, beware that there might be phases |
Both mailing lists are also archived at Gmane: | Both mailing lists are also archived at Gmane: | ||
* [[http:// | * [[http:// | ||
- | * [[http:// | + | * [[http:// |
===== Snippets ==== | ===== Snippets ==== | ||
Line 156: | Line 152: | ||
===== Maintenance ===== | ===== Maintenance ===== | ||
- | <note warning> | + | <note warning> |
- | ==== Create new Git Project on X2go Git ==== | + | ==== Create new Git Project on X2Go Git ==== |
Create a local Git project: | Create a local Git project: | ||
Line 180: | Line 176: | ||
</ | </ | ||
- | Now you can start working on your new X2go project as on any of the other already existing | + | Now you can start working on your new X2Go project as on any of the other already existing |
==== Edit Git Configs ==== | ==== Edit Git Configs ==== | ||
Line 206: | Line 202: | ||
===== Backyard ===== | ===== Backyard ===== | ||
- | |||
- | < | ||
==== Reverting Merge Commits ==== | ==== Reverting Merge Commits ==== | ||
Line 213: | Line 207: | ||
If you forget to run '' | If you forget to run '' | ||
- | There is nothing bad about merge commits apart from the fact that the X2go Git system won't allow them being pushed to the server :-/. | + | There is nothing bad about merge commits apart from the fact that the X2Go Git system won't allow them being pushed to the server :-/. |
Thus, you probably want to avoid merge commits right from the beginning. However, from time to time it occurs that you crunch your Git log with a merge commit. This is how such a thing can happen: | Thus, you probably want to avoid merge commits right from the beginning. However, from time to time it occurs that you crunch your Git log with a merge commit. This is how such a thing can happen: | ||
Line 219: | Line 213: | ||
* change a file | * change a file | ||
* commit it locally | * commit it locally | ||
- | * push it to X2go Git | + | * push it to X2Go Git |
* find that the push operation gets rejected :-( | * find that the push operation gets rejected :-( | ||
* then run '' | * then run '' | ||
Line 249: | Line 243: | ||
</ | </ | ||
- | ==== Pushing to X2go Git ==== | + | ==== Pushing to X2Go Git ==== |
- | Whenever your local X2go Git project is in an acceptable state for the community, feel free to push the code to the X2go Git server: | + | Whenever your local X2Go Git project is in an acceptable state for the community, feel free to push the code to the X2Go Git server: |
< | < | ||
Line 263: | Line 257: | ||
</ | </ | ||
- | The update scripts of X2go Git will shout warnings at you while pushing. These warnings relate to | + | The update scripts of X2Go Git will shout warnings at you while pushing. These warnings relate to |
* whitespaces found at the end of lines | * whitespaces found at the end of lines |