[sr-dev] Git push problems

[Peter Dunkley]

Thanks,

That worked.  I thought it was something stupid I was doing!

Peter

On Tue, 2012-08-14 at 10:10 +0200, Daniel-Constantin Mierla wrote:

> Hello,
> 
> error messages shows that git tries to push to a root branch 'origin' or 
> 'outbound' on the remote server, not under 'pd/outbound
> 
> Did you try the command:
> 
> git push origin outbound:pd/outbound
> 
> 
> It is how I would push local branch 'outbound' to remote 'pd/outbound'. 
> I think 'origin' does not have to be on the branch path, it is just a 
> parameter to git push to identify the remote repo.
> 
> Cheers,
> Daniel
> 
> 
> On 8/14/12 9:43 AM, Peter Dunkley wrote:
> > I won't have access to the computer I was using last night for the rest of
> > today (although I will be on another machine I can try from), but I just
> > retried my push on a clean checkout and it still fails:
> >
> > $ cd modules_k/
> > $ cp -R ~/backup/outbound .
> > $ cd ..
> > $ git add modules_k/outbound/
> > $ git commit .
> > [outbound e44e6e9] modules_k/outbound: added stub module for Outbound
> >   7 files changed, 393 insertions(+)
> >   create mode 100644 modules_k/outbound/Makefile
> >   create mode 100644 modules_k/outbound/README
> >   create mode 100644 modules_k/outbound/api.h
> >   create mode 100644 modules_k/outbound/doc/Makefile
> >   create mode 100644 modules_k/outbound/doc/outbound.xml
> >   create mode 100644 modules_k/outbound/doc/outbound_admin.xml
> >   create mode 100644 modules_k/outbound/ob_mod.c
> > $ git push
> > Everything up-to-date
> > $ git push origin
> > Everything up-to-date
> > $ git push origin outbound
> > Counting objects: 14, done.
> > Delta compression using up to 2 threads.
> > Compressing objects: 100% (12/12), done.
> > Writing objects: 100% (12/12), 4.27 KiB, done.
> > Total 12 (delta 2), reused 0 (delta 0)
> > remote: error: hook declined to update refs/heads/outbound
> > To ssh://pd@git.sip-router.org/sip-router
> >   ! [remote rejected] outbound -> outbound (hook declined)
> > error: failed to push some refs to 'ssh://pd@git.sip-router.org/sip-router'
> > $ git push origin origin/pd/outbound
> > Total 0 (delta 0), reused 0 (delta 0)
> > remote: error: hook declined to update refs/remotes/origin/pd/outbound
> > To ssh://pd@git.sip-router.org/sip-router
> >   ! [remote rejected] origin/pd/outbound -> origin/pd/outbound (hook declined)
> > error: failed to push some refs to 'ssh://pd@git.sip-router.org/sip-router'
> >
> > Thanks,
> >
> > Peter
> >
> >> $ git branch
> >>    master
> >> * outbound
> >>
> >> Also,
> >> $ git branch -r
> >>    origin/3.1
> >>    origin/3.2
> >>    origin/3.3
> >>    origin/HEAD -> origin/master
> >> ...
> >>    origin/pd/outbound
> >>    origin/pd/websocket
> >> ...
> >>
> >> When I do a new clone of the repository and checkout the branch I get
> >> this,
> >> $ git clone ssh://pd@git.sip-router.org/sip-router kamailio2
> >> Cloning into 'kamailio2'...
> >> remote: Counting objects: 133561, done.
> >> remote: Compressing objects: 100% (32070/32070), done.
> >> remote: Total 133561 (delta 94741), reused 129195 (delta 90624)
> >> Receiving objects: 100% (133561/133561), 34.09 MiB | 1.72 MiB/s, done.
> >> Resolving deltas: 100% (94741/94741), done.
> >> $ cd kamailio2/
> >> $ git checkout -b outbound origin/pd/outbound
> >> Branch outbound set up to track remote branch pd/outbound from origin.
> >> Switched to a new branch 'outbound'
> >>
> >> Regards,
> >>
> >> Peter
> >>
> >>> Hello,
> >>>
> >>> what is the output of 'git branch'?
> >>>
> >>> Cheers,
> >>> Daniel
> >>>
> >>> On 8/14/12 1:09 AM, Peter Dunkley wrote:
> >>>> Hi,
> >>>>
> >>>> I've been having some problems with git this evening.
> >>>>
> >>>> Earlier today (at the office) I created a branch to start the Outbound
> >>>> development on.
> >>>>
> >>>> This evening (at home, on another computer) I checked out this branch
> >>>> using "git checkout -b outbound origin/pd/outbound"
> >>>>
> >>>> I added some files, made some changes, and committed them to the local
> >>>> branch, but I can't seem to push these changes.
> >>>>
> >>>> When I do "git push" I get "Everything up-to-date" - which is not the
> >>>> case.  When I try something more specific like "git push origin
> >>>> origin/pd/outbound" I get:
> >>>>
> >>>>     Total 0 (delta 0), reused 0 (delta 0)
> >>>>     remote: error: hook declined to update
> >>>> refs/remotes/origin/pd/outbound
> >>>>     To ssh://pd@git.sip-router.org/sip-router
> >>>>      ! [remote rejected] origin/pd/outbound -> origin/pd/outbound (hook
> >>>> declined)
> >>>>     error: failed to push some refs to
> >>>> 'ssh://pd@git.sip-router.org/sip-router'
> >>>>
> >>>> I have pushed some fixes to master this evening from this same computer
> >>>> -
> >>>> so it must be something to do with the branch or the "git push"
> >>>> operation
> >>>> itself.
> >>>>
> >>>> I'm sure I've just done something stupid... but I can't think what it
> >>>> might be.
> >>>>
> >>>> Regards,
> >>>>
> >>>> Peter
> >>>>
> >>>
> >>> --
> >>> Daniel-Constantin Mierla - http://www.asipto.com
> >>> http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
> >>> Kamailio Advanced Training, Seattle, USA, Sep 23-26, 2012 -
> >>> http://asipto.com/u/katu
> >>> Kamailio Practical Workshop, Netherlands, Sep 10-12, 2012 -
> >>> http://asipto.com/u/kpw
> >>>
> >>>
> >>
> >> --
> >> Peter Dunkley
> >> Technical Director
> >> Crocodile RCS Ltd
> >>
> >>
> >
> 


-- 
Peter Dunkley
Technical Director
Crocodile RCS Ltd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sip-router.org/pipermail/sr-dev/attachments/20120814/20205010/attachment.htm>