Changes between Version 20 and Version 21 of Developer/Git/Committers


Ignore:
Timestamp:
Nov 23, 2014, 11:38:31 AM (5 years ago)
Author:
Chris Johns
Comment:

Updated. The personal repo picture is missing.

Legend:

Unmodified
Added
Removed
Modified
  • Developer/Git/Committers

    v20 v21  
    99
    1010The preferred workflow for making changes to RTEMS is to push patches to a committer's personal repository in public view and then merge changes from there. For working on enhancements or bug fixes committers are encouraged to push to branches on their personal repositories and to merge into the main RTEMS repository from their personal repository. Personal branches should not be pushed to the RTEMS repository.
     11
    1112=  SSH Access  =
    1213
    13 Currently all committer's should have an ssh account on the main git server, git.rtems.org.  If you have been granted commit access and do have an account on git.rtems.org one should be requested on the rtems-devel@rtems.org list. SSH access for git uses key logins instead of passwords. The key should be at least 1024bits in length.
    14 
    15 The public repositories can by cloned with {{{git clone ssh://user@git.rtems.org/data/git/rtems.git}}} (or replace rtems.git with another repo)
     14Currently all committer's should have an ssh account on the main git server, dispatch.rtems.org.  If you have been granted commit access and do have an account on dispatch.rtems.org one should be requested on the devel@rtems.org list. SSH access for git uses key logins instead of passwords. The key should be at least 1024bits in length.
     15
     16The public repositories can by cloned with {{{git clone ssh://user@dispatch.rtems.org/data/git/rtems.git}}} (or replace rtems.git with another repo)
     17
    1618=  Personal Repository  =
    1719
    18 Personal repositories keeps the clutter away from the master repository. A user with a personal repository can make commits, create and delete branches, plus more without interfering with the master repository. Commits to the master repository generate email to the rtems-vc@rtems.org list and development type commits by a developer would only add noise and lessen the effectiveness of the commit list.
     20Personal repositories keeps the clutter away from the master repository. A user with a personal repository can make commits, create and delete branches, plus more without interfering with the master repository. Commits to the master repository generate email to the vc@rtems.org list and development type commits by a developer would only add noise and lessen the effectiveness of the commit list.
    1921
    2022A committer should maintain a personal clone of the RTEMS repository through which all changes merged into the RTEMS head are sent. The personal repository is also a good place for committers to push branches that contain works in progress. The following instructions show how to setup a personal repository that by default causes commits to go to your private local repository and pushes to go to your publicly visible personal repository. The RTEMS head is configured as a remote repository named 'upstream' to which you can push changes that have been approved for merging into RTEMS.
     
    3941Clone the repository on your local machine
    4042{{{
    41 # git clone ssh://user@git.rtems.org/home/user/git/rtems.git
     43# git clone ssh://user@dispatch.rtems.org/home/user/git/rtems.git
    4244# cd rtems
    4345}}}
    4446Add the RTEMS repository as a remote repository and get the remote tags and branches
    4547{{{
    46 # git remote add upstream ssh://user@git.rtems.org/data/git/rtems.git
     48# git remote add upstream ssh://user@dispatch.rtems.org/data/git/rtems.git
    4749# git fetch upstream
    4850}}}
     
    5153
    5254[[Image(git-personalrepo.png)]]
     55
    5356==  Check your setup  ==
    5457