{"thread":{"id":"13761","subject":"problem with branches","startedAt":"2008-06-02T10:14:07Z","lastAt":"2008-06-02T17:23:47Z","messageCount":2,"participants":["Alf Clement","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"78348","messageId":"556d90580806020314u7ba60af7kc0176a1867ba32fb@mail.gmail.com","threadId":"13761","inReplyTo":null,"subject":"problem with branches","fromName":"Alf Clement","fromEmail":"alf.clement@gmail.com","sentAt":"2008-06-02T10:14:07Z","receivedAt":"2008-06-02T10:14:07Z","isPatch":false,"sender":{"key":"alf.clement@gmail.com","avatar":null},"body":"Hi all,\n\nI created 4 branches with a remote repository on a server.\nI've changed some files locally, committed and now try to push... but\nit fails with hook declined.\nNow the status:\n$ git pull -v\nFrom git://XXXX/YY\n = [up to date]      TEST       -> origin/TEST\n = [up to date]      master     -> origin/master\n = [up to date]      v1.03      -> origin/v1.03\n = [up to date]      v2.07      -> origin/v2.07\n = [up to date]      v3.11      -> origin/v3.11\nAlready up-to-date.\n\n$ git push -v\nPushing to git://XXXX/YY\nGIT TRANPORT\nLooking up XXXX ... done.\nCounting objects: 31, done.\nCompressing objects: 100% (14/14), done.\nWriting objects: 100% (21/21), 2.02 KiB, done.\nTotal 21 (delta 8), reused 0 (delta 0)\nTo git://XXXX/YY\n = [up to date]      TEST -> TEST\n ! [remote rejected] master -> master (hook declined)\n ! [remote rejected] v3.11 -> v3.11 (hook declined)\nerror: failed to push some refs to 'git://XXXX/YY'\n\nI also get a warning when moving between branches:\n$ git checkout v3.11\nSwitched to branch \"v3.11\"\nYour branch is ahead of the tracked remote branch 'origin/v3.11' by 1 commit.\n\n$ git checkout master\nSwitched to branch \"master\"\nYour branch is ahead of the tracked remote branch 'origin/master' by 2 commits.\n\nAny ideas how to recover from here?\nThe git-daemon seems to run fine, as I can commit and push from\nanother test project.\nIt would be nice if there were more clean failure messages from the\ndaemon...(Enhancement)\n\nThanks,\nAlf\n"},{"id":"78386","messageId":"20080602172346.GA18945@sigill.intra.peff.net","threadId":"13761","inReplyTo":"556d90580806020314u7ba60af7kc0176a1867ba32fb@mail.gmail.com","subject":"Re: problem with branches","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-06-02T17:23:47Z","receivedAt":"2008-06-02T17:23:47Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Jun 02, 2008 at 12:14:07PM +0200, Alf Clement wrote:\n\n>  = [up to date]      TEST -> TEST\n>  ! [remote rejected] master -> master (hook declined)\n>  ! [remote rejected] v3.11 -> v3.11 (hook declined)\n> error: failed to push some refs to 'git://XXXX/YY'\n\nOK. So your \"update\" hook returned failure. What's in the remote's\n.git/hooks/update?\n\n> I also get a warning when moving between branches:\n> $ git checkout v3.11\n> Switched to branch \"v3.11\"\n> Your branch is ahead of the tracked remote branch 'origin/v3.11' by 1 commit.\n\nThis is fine; it's just reminding you that you have commits that could\nbe pushed.\n\n-Peff\n"}]}