GIT Server

From AlsaProject
Jump to: navigation, search


ALSA Repositories

contains compatibility and build code for older 2.6 kernels with mirrored latest kernel code
contains linux 2.6 kernel tree
contains linux 2.6 kernel tree - for private branches for alsa developers
oss compatibility
official python binding
ALSA Use-Case-Manager configuration library
Compressed formats support library
Open sound firmware
ALSA service repo (misc files)
old ALSA driver repository without the mirrored kernel code
alsa kernel mirror tree for continuous development (contains ALSA parts from alsa-kernel.git tree)

Anonymous access

Read only GIT server

git clone git:// alsa-driver
git clone git:// alsa-kernel
git clone git:// alsa-kprivate
git clone git:// alsa-lib
git clone git:// alsa-utils
git clone git:// alsa-firmware
git clone git:// alsa-tools
git clone git:// alsa-plugins
git clone git:// alsa-oss
git clone git:// alsa-python
git clone git:// alsa-ucm-conf
git clone git:// tinycompress
git clone git:// sound-open-firmware
git clone git:// sound-open-firmware-tools
git clone git:// alsa
git clone git:// alsa
git clone git:// alsa-kmirror

Web interface

HTTP access

For developers - kernel drivers

Common rules

1) be very very very carefull when you use '--force' for 'git push', you can broke whole repository, you should notify other developers on alsa-devel mailing list that you will do this change for 'master' branch
2) valid 'Signed-off-by:' line must be in the commit text

Rules for alsa-kernel.git and the mirror branch in alsa-driver.git

1) subject (first commit text line) must start with '[ALSA] ' or 'ALSA: ' or '[sound] ' or 'sound: '

Rules for alsa-kprivate.git

No rules. Just do not overwrite branches created by someone else. The 'master' branch is equal to linux-2.6 official tree from git:// (do sync if necessary):

 git remote add linux-2.6 git://
 git checkout master
 git pull linux-2.6 master
 git push --tags origin master

Syncing the branch release in alsa-driver.git

 Please, use --log for the git merge command to show the "subject" of commits.
 It might be handy to define these git aliases in your .git/config file:
       apull = !git checkout release && git pull origin release && \
                git checkout build && git pull origin build && \
                git checkout mirror && git pull origin mirror && \
                git checkout release
       apush = !git push --tags origin release && git push origin build && \
                git push origin mirror
       bmerge = !git checkout release && git merge --log build
       mmerge = !git checkout release && git merge --log mirror

Clone repositories

git clone alsa-driver
cd alsa-driver
git branch build remotes/origin/build
git branch mirror remotes/origin/mirror
git branch release remotes/origin/release
git clone alsa-kernel

To show all branches (includes remote ones):

git branch -a

To make a remote branch local:

git checkout -b for-linus remotes/origin/for-linus
git checkout -b linux-2.6 remotes/origin/linux-2.6

Update and rebase using Linus's 2.6 kernel tree

Add remote URL:

git remote add linux-2.6 git://

Checkout linux-2.6 branch:

git checkout linux-2.6

Pull Linus's 2.6 changes:

git pull linux-2.6 master

Rebase our main ALSA development master branch with linux-2.6:

git rebase linux-2.6 master

Push branch changes to ALSA GIT repository

git push --tags origin master
git push --tags origin linux-2.6
git push --tags origin for-linus

Note: Especially after 'git rebase' the repository on server is not consistent with local repository (remote ref is not ancestor of the local ref for master branch), so you have to use --force parameter for 'git push' command. Note that this might be dangerous - please, ask Jaroslav Kysela < perex at perex . cz > if you can do this for branch 'master'.


this branch is for main development, managed by Jaroslav Kysela, it is rebased before ALSA releases
the contents is synced to alsa-kmirror.git
this branch is for linux next testing tree (originaly maintaned by Andrew Morton), rebased
this branch is for mainstream tree (for Linus Torvalds), just temporary branch
this is official linux 2.6 mainstream tree
patches for stable 2.6 kernels


Private tags are not allowed. Only branches identifying ALSA version (alsa-driver.git) or official linux kernel version (alsa-kernel.git) are allowed.


GIT server is maintaned by User:Perex.

Occasional Developers

This section is for developers without write access to ALSA git. i.e., who will clone repos and send in patches

clone the repository

git clone git:// alsa-driver 

If you live behind a firewall that blocks the git protocol, you can do this instead:

git clone alsa-driver 

Create local branches:

cd alsa-driver
git branch build remotes/origin/build
git branch mirror remotes/origin/mirror
git branch release remotes/origin/release

Note: You may do changes directly in the Linus's kernel GIT tree and send the patches from it.

configure git

Set your email address correctly otherwise commits get spurious email address for Author and Commiter

git config --add

Make sure it knows how to send email (for patches)

git config --add sendemail.smtpserver

save current

in case you want to roll back

git branch save

do your work

edit, compile, test, sweat

If it didn't work out and you want to get back to the old tree

git reset --hard save

generate patches

Want to get patch against latest, so rebase

git rebase origin/master
git diff remotes/origin/master

Then do this to generate the patchset

git format-patch -s -n -p --subject-prefix="PATCH - my module" remotes/origin/master

check the patches

/lib/modules/`uname -r`/build/scripts/ --no-tree *.patch

sending the patches

git send-email --from=me  000*.patch

get up to date

cd alsa-driver
git checkout build
git pull origin build
git checkout mirror
git pull origin mirror
git checkout release
git pull origin release

Sometimes you can just make and things will be fine. However, when there have been changes to the build system etc, its best to do a make clean; ./gitcompile to get the tree properly up to date.

Custom Search
Personal tools