Re: using stgit/guilt for public branches

From: Yann Dirson <ydirson@altern.org>
Date: May 4, 2007, 23:12 UTC
Message-ID: <20070504231225.GD19253@nan92-1-81-57-214-146.fbx.proxad.net>
In-Reply-To: <20070503205836.GA19253@nan92-1-81-57-214-146.fbx.proxad.net>

On Thu, May 03, 2007 at 10:58:36PM +0200, Yann Dirson wrote:

Show 5 quoted lines

> As for publishing, I use the following config entries to publish my
> own stack of patches to stgit.  You can see at
> http://repo.or.cz/w/stgit/ydirson.git that gitweb shows pretty clearly
> the structure of the stack (even though things could surely be made
> better).

Let's make things even more fun: I have now moved a couple of patches (testsuite cases to demonstrate bugs still to be fixed) to a new stack so they don't get pulled by error. This stack itself is forked off my master stack, and I just have to "stg pull" to get it rebased to the new master head (requires stgit head, not in 0.12*):

[branch "bugs.stgit"]
        pull-policy = rebase
        parentbranch = master

> I use "git push -f" to publish - maybe the "+" refspec syntax would
> work with push, I'll try it next time :)

It indeed works as expected, so the final syntax is as follows, so "git push orcz" is now sufficient to publish everything, and you can now fork your own stack off my remote "bugs" stack, which itself forked off my "master" stack - enjoy :)

[remote "orcz"]
        url = git+ssh://ydirson@repo.or.cz/srv/git/stgit/ydirson.git
        fetch = +refs/heads/*:refs/remotes/orcz/*

        push = +refs/heads/master:refs/heads/master
        push = +refs/patches/master/*:refs/patches/master/*

        push = +refs/heads/bugs:refs/heads/bugs
        push = +refs/patches/bugs/*:refs/patches/bugs/*

Best regards,

-- 
Yann.