GIT Server of ALSA Repositories

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

[edit]Rules for alsa-kernel.git

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

[edit]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://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (do sync if necessary):

 git remote add linux-2.6 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 git checkout master
 git pull linux-2.6 master
 git push --tags origin master:refs/heads/master

[edit]Syncing

Note that 'master' branch in alsa-kernel.git is synced with alsa-kmirror.git 'master' branch automatically. So if you add a patch to alsa-kernel.git, it will be merged to alsa-kmirror.git (if no problem occurs) when you initiate 'git push' to the ALSA server. It's really required to see messages from the pre-receive script when something goes wrong. The script is trying to suggest what's going wrong and try to show you a problematic code (diff).

Pushing to 'alsa-kmirror.git' should be only done if:

a) you fixing a sync problem

b) you are modifying a file which is out of sync (scripts directory or so)

In all other cases, only alsa-kernel.git repository should be used.

The pre-receive script uses all four commit identifiers Author + AuthorDate + Commit + CommitDate to pair commits between alsa-kernel.git and alsa-kmirror.git. Use this information, if you like to add some commits manually to alsa-kmirror.git tree.

[edit]Common problems

PRE-RECEIVE repositories does not match, please, fix it

The alsa-kmirror.git#mastter and alsa-kernel.git#master sources does not match. You have to do manual changes in alsa-kmirror.git repository to sync trees. A diff between alsa-kmirror.git and alsa-kernel.git is printed to stderr, so you can analyze it and do appropriate steps.

PRE-RECEIVE Patch failed - is it already merged?

Appearently, you're trying to apply a patch which cannot be applied cleanly to alsa-kmirror.git#master. One reason might be that the patch is already applied, but the pre-receive script does not know about it. You may add commiter and commitdate to alsa-kmirror/scripts/git-ok-commits file to skip problematic commit (but only if you really verify, that this commit is already in the alsa-kmirror tree).

[edit]Clone repositories

git clone git@git.alsa-project.org:alsa-driver.git alsa-driver
git clone git@git.alsa-project.org:alsa-kernel.git alsa-kernel
git clone git@git.alsa-project.org:alsa-kmirror.git alsa-kmirror

To show all branches (includes remote ones):

git branch -a

To make a remote branch local:

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

[edit]Update and rebase using Linus's 2.6 kernel tree

Add remote URL:

git remote add linux-2.6 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/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

[edit]Push branch changes to ALSA GIT repository

git push --tags origin master:refs/heads/master
git push --tags origin linux-2.6:refs/heads/linux-2.6
git push --tags origin for-linus:refs/heads/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'.

[edit]Branches

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

linux-next

this branch is for linux next testing tree (originaly maintaned by Andrew Morton), rebased

for-linus

this branch is for mainstream tree (for Linus Torvalds), just temporary branch

linux-2.6

this is official linux 2.6 mainstream tree

stable-2.6.<number>

patches for stable 2.6 kernels

[edit]Tags

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

[edit]Maintenance

GIT server is maintaned by User:Perex.

[edit]Occasional Developers

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

[edit]clone the repository

git clone git://git.alsa-project.org/alsa-driver.git alsa-driver 
git clone git://git.alsa-project.org/alsa-kmirror.git alsa-kmirror

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

git clone http://git.alsa-project.org/http/alsa-driver.git alsa-driver 
git clone http://git.alsa-project.org/http/alsa-kmirror.git alsa-kmirror

if you like do only changes in code in alsa-kmirror, please, use alsa-kernel repository

git clone git://git.alsa-project.org/alsa-kernel.git alsa-kernel

but we accept patches in both forms

[edit]configure git

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

git-config --add user.email me@domain.com

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

git-config --add sendemail.smtpserver smtp.domain.com

[edit]save current

in case you want to roll back

git-branch save

[edit]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

[edit]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

[edit]check the patches

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

[edit]sending the patches

git-send-email --from=me --to=patch@alsa-project.org --cc=alsa-devel@alsa-project.org  000*.patch

[edit]get up to date

For both alsa-kmirror and alsa-driver

git-pull

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.

Category: Development