important : Git branch switch

[Stefan Sauer]

On 03/26/2012 05:23 PM, Edward Hervey wrote:
> Hello everyone,
>
>   Wim has currently pushed the branch switches that was discussed last
> week, which is another step towards 1.0.
>
>   This means that from now on:
>   * All 'master' branches for GStreamer modules on git.freedesktop.org
> are for 0.11/1.0 development
>   * The previous master branches contents (i.e. tracking the 0.10
> development) have been moved to '0.10' branches.
>
>   IMPORTANT : DO NOT DO A GIT PULL IF YOU DO NOT KNOW WHAT YOU ARE
> DOING ! Otherwise it will try to merge (or rebase) against a changed
> remote branch.
>
>   The easiest is :
>   * fetch all remote commits : $ git remote update
>     (That won't replace anything locally)
>   * Change what upstream branches you are tracking (explained below)
>   * And continue business as usual
>
>   Care needs to be taken if you've been doing local development by
> instructing which upstream branches to track. The generic command is:
>   $ git branch <localbranch> --set-upstream <remote>/<branch>
>
>   Examples:
>   If you previously had a local branch called master, which was tracking
> origin/master you need to locally instruct git to now track the
> origin/0.10 branch:
>   $ git branch master --set-upstream origin/0.10
>
>   If you previously had a local branch called 0.11, which was tracking
> origin/0.11, you need to locally instruct git to now track the
> origin/master branch:
>   $ git branch 0.11 --set-upstream origin/master
This seems to be just half of the story. I did all the above which
worked fine, but somehow git was pushing still on the 0.11 branch :/
Here is the .git/config and below the shell session.

Stefan

[core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
[remote "origin"]
    fetch = +refs/heads/*:refs/remotes/origin/*
    url = ssh://git.freedesktop.org/git/gstreamer/gst-plugins-good
[branch "0.11"]
    remote = origin
    merge = refs/heads/master
[submodule "common"]
    url = git://anongit.freedesktop.org/gstreamer/common



ensonic at sawtooth:~/projects/gstreamer/0.11/gst-plugins-good:(git:0.11)>
git pull --rebase
remote: Counting objects: 101, done.
remote: Compressing objects: 100% (58/58), done.
remote: Total 58 (delta 53), reused 0 (delta 0)
Unpacking objects: 100% (58/58), done.