User Tools

Site Tools


wiki:development:git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

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 [2014/04/28 13:02] (current)
sunweaver
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): ''​git-admin (at) x2go (dot) org'',​ a discussion about content should be held on the developers'​ mailing list: ''​x2go-dev@lists.berlios.de''​.+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): ''​git-admin (at) x2go (dot) org'',​ a discussion about content should be held on the developers'​ mailing list: ''​x2go-dev@lists.x2go.org''​.
  
 ===== Access ===== ===== Access =====
Line 27: Line 27:
 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 ''​~/​.gitconfig''​ with your favourite editor and put the followings lines in it (of course, you may want to personalize some of the fields): 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 ''​~/​.gitconfig''​ with your favourite editor and put the followings lines in it (of course, you may want to personalize some of the fields):
Line 37: Line 37:
 </​code>​ </​code>​
  
 +==== 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:​bugs|X2Go Bug Tracker System]].
  
-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: 
  
-<​note>​TODO:​ Write/Link howto</​note>​ +==== Developer Git Access via SSH ====
- +
-  patches@x2go.org +
- +
-=== Developer Git Access via SSH ===+
  
  
Line 53: Line 50:
   $ git push ssh://​x2go@code.x2go.org:<​port>/​srv/​git/​code.x2go.org/<​package>​ <​branch>​   $ git push ssh://​x2go@code.x2go.org:<​port>/​srv/​git/​code.x2go.org/<​package>​ <​branch>​
  
-=== 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 59:
 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://​lists.berlios.de/mailman/​listinfo/​x2go-commits) +  * Git commits -> x2go-commits@lists.x2go.org (https://​lists.x2go.org/​listinfo/​x2go-commits) 
-  * Git tags -> x2go-announcement@lists.berlios.de (https://​lists.berlios.de/mailman/​listinfo/​x2go-announcement)+  * Git tags -> x2go-tags@lists.x2go.org (https://​lists.x2go.org/​listinfo/​x2go-tags)
  
-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 ​during which you get flooded by mails. Furthermore the lists are read-only. Postings to these lists will be dropped automatically by the mailing list service. ​
  
 Both mailing lists are also archived at Gmane: Both mailing lists are also archived at Gmane:
  
   * [[http://​blog.gmane.org/​gmane.linux.terminal-server.x2go.scm|gmane.linux.terminal-server.x2go.scm]] -- X2Go Git commit messages (read-only)   * [[http://​blog.gmane.org/​gmane.linux.terminal-server.x2go.scm|gmane.linux.terminal-server.x2go.scm]] -- X2Go Git commit messages (read-only)
-  * [[http://​blog.gmane.org/​gmane.linux.terminal-server.x2go.tags|gmane.linux.terminal-server.x2go.tags]] -- X2go Git taggings (read-only)+  * [[http://​blog.gmane.org/​gmane.linux.terminal-server.x2go.tags|gmane.linux.terminal-server.x2go.tags]] -- X2Go Git taggings (read-only)
  
 ===== Snippets ==== ===== Snippets ====
Line 156: Line 153:
 ===== Maintenance ===== ===== Maintenance =====
  
-<note warning>​This is only for admins having access to the x2go git server.</​note>​+<note warning>​This is only for admins having access to the X2Go Git server.</​note>​
  
-==== 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 177:
 </​code>​ </​code>​
  
-Now you can start working on your new X2go project as on any of the other already existing ​X2go Git projects.+Now you can start working on your new X2Go project as on any of the other already existing ​X2Go Git projects.
  
 ==== Edit Git Configs ==== ==== Edit Git Configs ====
Line 206: Line 203:
  
 ===== Backyard ===== ===== Backyard =====
- 
-<​note>​Is this really needed??​!</​note>​ 
  
 ==== Reverting Merge Commits ==== ==== Reverting Merge Commits ====
Line 213: Line 208:
 If you forget to run ''​git-pull''​ before modifying code files you will run into merge problems when committing your changes. If you forget to run ''​git-pull''​ before modifying code files you will run into merge problems when committing your changes.
  
-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 214:
   * 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 ''​git-pull''​ instead   * then run ''​git-pull''​ instead
Line 249: Line 244:
 </​code>​ </​code>​
  
-==== 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:
  
 <​code>​ <​code>​
Line 263: Line 258:
 </​note>​ </​note>​
  
-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
wiki/development/git.1357829110.txt.gz · Last modified: 2013/03/08 13:31 (external edit)