Difference between revisions of "TM/Git Workflows"

From Eclipsepedia

< TM
Jump to: navigation, search
Line 21: Line 21:
 
#** Set to your $HOME/.ssh in order to share with Msysgit - or copy the $HOME/.ssh folder
 
#** Set to your $HOME/.ssh in order to share with Msysgit - or copy the $HOME/.ssh folder
 
#** Generate a private/public key pair if necessary (in the UI, or on Git Bash as per below link)
 
#** Generate a private/public key pair if necessary (in the UI, or on Git Bash as per below link)
#** Upload your [[Gerrit#SSH_Keys]]
+
#** Upload your [[Gerrit#SSH_Keys]] - using a passphrase is recommended
 +
# Set up SSH private key for Tortoise Git (this is re-used by Egit)
 +
#* Launch '''C:\Program Files\TortoiseGit\bin\puttygen.exe''' to load your openssh private key and convert into a putty private key in your home/.ssh
 +
#* Launch '''C:\Program Files\TortoiseGit\bin\pageant.exe''' ; right-click the icon in taskbar and load your putty private key (agent will serve Egit, Msysgit and Tortoisegit)
 +
#** Recommend placing a link for pageant on your desktop to ensure SSH authentication with your private key
 +
#** '''NOTE''' Inside Egit this should also be possible somehow internal with JSch / Jgit but I did not get it to work
  
 
== Linux Install ==
 
== Linux Install ==
Line 45: Line 50:
 
* UI - Refer to [[EGit/User Guide]] for more detailed instructions
 
* UI - Refer to [[EGit/User Guide]] for more detailed instructions
 
** File > Import > Git : Projects from Git
 
** File > Import > Git : Projects from Git
*** URI, Next, Paste URL: '''ssh://userid@git.eclipse.org:29418/tm/org.eclipse.tm.git''', Edit userid
+
*** URI, Next, Paste URL: '''ssh://userid@git.eclipse.org:29418/tm/org.eclipse.tm.git''', Edit userid, Next
 
**** Read-only contributors paste '''git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git'''
 
**** Read-only contributors paste '''git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git'''
 +
*** Import projects from file system as needed, next

Revision as of 13:49, 8 November 2012

Contents

Installation

Windows Install

  1. Install Tortoise Git. Not a must-have but helpful. Recommended to install this first.
  2. Install Msysgit as per the Tortoise Git instructions. Not a must-have but strongly recommended from the start, in order to be consistent between egit and commandline.
  3. Launch Git Bash
    • If it is slow for you, you may want to set a HOME environment variable to a local disk and update the Git Bash program shortcut
    • For me, the default %HOMEDRIVE%%HOMEPATH% pointed to a non-existing remote folder, making everything dead slow
    • I've set HOME=D:/Workspaces/git -- all your git repos will be below there by default, and your user config too
    • Re-start to verify Git Bash is fast and HOME is accurate
  4. Set up your user ID on git bash as per Git#Committers_new_to_Git
  git config --global user.email my_committer_email@address.com
  git config --global user.name "John Doe"
  1. Launch Eclipse SDK and install latest Egit from http://download.eclipse.org/egit/updates
    • Check Preferences > Team > Git > Configuration whether it picked up your commandline settings
      • May need to specify Location of Msysgit install in System Settings
      • May want to update Default Repository Folder in Git : Cloning Repositories
      • In user settings, set branch.autosetuprebase = always as per Platform-releng/Git_Workflows#Configure_the_workspace
      • In Preferences > General > Workspace, set New text file line delimiter to Unix
    • Check Preferences > General > Network > SSH2 home directory
      • Set to your $HOME/.ssh in order to share with Msysgit - or copy the $HOME/.ssh folder
      • Generate a private/public key pair if necessary (in the UI, or on Git Bash as per below link)
      • Upload your Gerrit#SSH_Keys - using a passphrase is recommended
  2. Set up SSH private key for Tortoise Git (this is re-used by Egit)
    • Launch C:\Program Files\TortoiseGit\bin\puttygen.exe to load your openssh private key and convert into a putty private key in your home/.ssh
    • Launch C:\Program Files\TortoiseGit\bin\pageant.exe ; right-click the icon in taskbar and load your putty private key (agent will serve Egit, Msysgit and Tortoisegit)
      • Recommend placing a link for pageant on your desktop to ensure SSH authentication with your private key
      • NOTE Inside Egit this should also be possible somehow internal with JSch / Jgit but I did not get it to work

Linux Install

This is a subset of the Windows install since more settings will be appropriate by default.

  1. Set up your user ID on git commandline as per Git#Committers_new_to_Git
  git config --global user.email my_committer_email@address.com
  git config --global user.name "John Doe"
  1. Launch Eclipse SDK and install latest Egit from http://download.eclipse.org/egit/updates


Cloning the Repo

  • Commandline:
 cd $HOME/git
 git clone ssh://userid@git.eclipse.org:29418/tm/org.eclipse.tm.git
 #readonly:# git clone git://git.eclipse.org/gitroot/tm/org.eclipse.tm.git


  • UI - Refer to EGit/User Guide for more detailed instructions
    • File > Import > Git : Projects from Git