Difference between revisions of "GIT"

Revision as of 15:45, 12 August 2009

We have migrated our Source Code Management tool to GIT scm. Therefore the Armadeus software release 3.1 is the last one available under SVN management tool. This page aims to help you to use our new GIT tool.

Install GIT

Install the following packages:

git-core gitk git-gui

How to use GIT (for everyone)

1. GIT-SVN Crash course
2. Everyday GIT With 20 Commands Or So
3. GIT website

• Get the Armadeus GIT/SF repository:

Note: This is Read Only method $ git clone git://armadeus.git.sourceforge.net/gitroot/armadeus armadeus

• Get the GIT/SF repository in Read/Write mode (for integrators only):

$ git clone ssh://USER@armadeus.git.sourceforge.net/gitroot/armadeus armadeus 

How to use GIT (Armadeus integrators)

• Before first commit define your global personnal data:

$ git config --global user.name "James Bond"
$ git config --global user.email "james.bond@007.com"

• Do your changes and commit to your local repository (here add fileorpath):

$ git add fileorpath
$ git commit -m 'Explain what I changed'
or 
$ git commit -a -m 'Explain what I changed'        (if you have local modifications (=not versioned files) and wants GIT to ignore them)

• Update your repository to the latest version on SF:

$ git pull

• If git pull fails with an error: "Untracked working tree file '{SOMEFILE}'"

$ rm -rf {SOMEFILE}
$ git pull

• If you have modified some armadeus files and want to revert your changes"

$ rm -rf buildroot/package
$ rm -rf buildroot/target
$ rm -rf buildroot/toolchain
$ git checkout -f
$ make apf9328_defconfig or make apf27_defconfig

Note: The command "git clean -dfx" cleans the working repository as like it was after the clone or the last rebase.

• Push your changes to SF:

$ git push

• Tag a revision:

$ git tag -m "Creates TAG for Armadeus 3.1 release" release-3.1
$ git push --tags origin master

GIT to do list

• To update to support git:

1. release/change.sh
2. buildroot/target/device/armadeus/linux/kernel-patches/move-patches.sh