[ANNOUNCE] New stable 3.0-rt-rebase branch at git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git

[ANNOUNCE] New stable 3.0-rt-rebase branch at git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git

[Steven Rostedt]

Because people have complained that there's no more broken out patches
of the stable -rt tree (even though all commits are publicly available
in git), I have decided to create a "rebase" branch. This branch will
contain all the commits for the preempt-rt stable tree based on the last
mainline stable release.

The v3.0-rt branch will never rebase, and should be what users develop
git repositories with.

The v3.0-rt-rebase branch is a branch that will rebase at every version,
and should *not* be used by other developmental git repositories. This
branch will allow you to pull out the commits that will apply to the
stable tree.

At each version, the rebase branch will be tagged with a "-rebase" name
after it.

$ git tag | grep -- -rt
v3.0.10-rt27
v3.0.10-rt27-rebase
v3.0.11-rt28
v3.0.11-rt28-rebase
v3.0.12-rt29
v3.0.12-rt29-rebase
v3.0.12-rt30
v3.0.12-rt30-rebase
v3.0.14-rt31
v3.0.14-rt31-rebase
v3.0.14-rt32
v3.0.14-rt32-rebase
v3.0.17-rt33
v3.0.17-rt33-rebase
v3.0.9-rt25
v3.0.9-rt26


As the 3.0 stable git tree started with 3.0.9-rt25, there was no need to
create a rebase version for that branch.  All rebase tagged commits will
equal their non-rebase counter part using git diff, but the commit IDs
will not be the same.

$ git diff v3.0.17-rt33 v3.0.17-rt33-rebase

The above will show no differences.

To create a quilt queue, simply do the following in your git repo:


$ cd linux-rt-stable.git
$ git checkout v3.0.17-rt33-rebase
$ mkdir patches
$ git format-patch -o patches v3.0.17
$ ls patches > series
$ mv series patches

Now the patches directory will be a quilt queue of the broken out
3.0.17-rt33 patches.

IMPORTANT NOTE: The rebase branch and tags are very low priority. If it
becomes too time consuming to maintain, I *will* stop adding them. They
will be created when I have time to do so. This rebase branch is a
convenience for people that may want it. It may be discontinued at any
time without notice!

-- Steve

Re: [ANNOUNCE] New stable 3.0-rt-rebase branch at git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git

[Steven Rostedt]

On Tue, 2012-01-24 at 11:45 -0500, Steven Rostedt wrote:

> $ git tag | grep -- -rt
> v3.0.10-rt27
> v3.0.10-rt27-rebase
> v3.0.11-rt28
> v3.0.11-rt28-rebase
> v3.0.12-rt29
> v3.0.12-rt29-rebase
> v3.0.12-rt30
> v3.0.12-rt30-rebase
> v3.0.14-rt31
> v3.0.14-rt31-rebase
> v3.0.14-rt32
> v3.0.14-rt32-rebase
> v3.0.17-rt33
> v3.0.17-rt33-rebase
> v3.0.9-rt25
> v3.0.9-rt26
> 

As I found out by testing what was pushed and not seeing what I expected
and going crazy in the mean time, I've discovered (thanks to the guys on
Freenode #git) that tags of commits that are not associated to any
branch (like these are) will not be pulled with a normal "git fetch" or
"git remote update".


You need to do a "git fetch --tags" to get the tags for the rebases that
are no long part of the v3.0-rt-rebase branch.

-- Steve