Karmic is branch happy

[Tim Gardner]

Brad Figg wrote:
> Tim Gardner wrote:
>> Pursuant to the conversation that Amit and I had about keeping
>> information branches in the Karmic git repo (for example,
>> pending-upstream-patches), I've created yet another branch
>> 'patches-that-need-love' that will contain UBUNTU patches that did not
>> forward port cleanly, and that we'd really like to have in the released
>> kernel. Of course, the first of those is that 'ball and chain' patch
>> 0001-UBUNTU-SAUCE-no-up-ACPI-initramfs-DSDT-override.patch from Jaunty.
>> Perhaps someone could have a go at it whilst I work on other things.
>>
>> Scott - I dropped 0001-UBUNTU-SAUCE-tracer-for-sreadahead.patch in there
>> as well so that we don't forget (in case your upstream patch doesn't
>> make it). You have submitted it, right?
>>
>> rtg
> 
> A little git help here...
> 
> When I update my repo on zinc I end up with what I was expecting:
>   bradf at zinc:/srv/kernel.ubuntu.com/git/bradf/ubuntu-karmic$ git branch -a
>   * master
>     origin/HEAD
>     origin/master
>     origin/patches-that-need-love
>     origin/pending-upstream-patches
> 
> When I update my local clone of my public zinc repo I see:
>   [bradf at brad-desktop]git branch -a
>   * master
>     origin/HEAD
>     origin/master
> 
> Why don't I see the same branches as the zinc, public repo does?
> 
> Brad
> 

Its all a matter of where origin points to, and the branches that exist
at that origin point. If you create a branch on your public repo, e.g.,

git checkout -b patches-that-need-love origin/patches-that-need-love

then you should be able to see the existence of that branch from your
local repo.

There is nothing particularly special about origin, its just the default
shorthand for referencing the remote repo from which your local repo was
created. Look at .git/config to see where it points.

You can do something similar by adding remote references. For example,

git remote add linus
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

This will allow you to reference other repos. I do something similar
while tracking updates from Linus in the Karmic tree:

git fetch linus
git rebase linus/master

rtg
-- 
Tim Gardner tim.gardner at canonical.com