Public SourceMage Discussion List

[Arwed von Merkatz <v.merkatz AT gmx.net>]

On Thu, May 04, 2006 at 01:33:17PM -0700, Eric Sandall wrote:
[...]
> > Now let's do some real work.  A new version of spell foo is out, and we
> > need to put it in test:
> > $ git pull
> > $ cd section/foo
> > $ <edit/test/edit/test>
> > $ git status (optional)
> > $ git diff (optional)
> > $ git add . (if there were new files)
> > $ git commit .
> 
> Just an FYI here, but you'll need to do
> $ cd ../..
> 
> As you need to be in the 'root' of the checkout, otherwise you will be
> told: Not a git repository: '.git'.
> 
> > $ git push ssh://scm.sourcemage.org/smgl/grimoire.git master:master
> <snip>
> 
> Is there a way we can avoid having to use a URL when pushing to the
> server we checked out from and with the branch we're currently in
> without setting an alias?
 
There is, but it needs a little setup:
- edit .git/remotes/origin in your repository, add these lines:
Push: refs/heads/devel:refs/heads/devel
Push: refs/heads/master:refs/heads/origin
Push: refs/heads/stable-0.3:refs/heads/stable-0.3
Push: refs/heads/stable-rc-0.4:refs/heads/stable-rc-0.4

Now you can push using the branch names, i.e.
$ git push origin master (pushes your master branch to remote origin ,i.e.
the remote test grimoire)
$ git push devel devel
...

-- 
Arwed v. Merkatz                              Source Mage GNU/Linux developer
                                                    http://www.sourcemage.org