problem with branches
- From
- Alf Clement <alf.clement@gmail.com>
- Date
- Jun 2, 2008, 10:14 UTC
- Message-ID
- <556d90580806020314u7ba60af7kc0176a1867ba32fb@mail.gmail.com>
Hi all,
I created 4 branches with a remote repository on a server. I've changed some files locally, committed and now try to push... but it fails with hook declined. Now the status: $ git pull -v From git://XXXX/YY = [up to date] TEST -> origin/TEST = [up to date] master -> origin/master = [up to date] v1.03 -> origin/v1.03 = [up to date] v2.07 -> origin/v2.07 = [up to date] v3.11 -> origin/v3.11 Already up-to-date.
$ git push -v Pushing to git://XXXX/YY GIT TRANPORT Looking up XXXX ... done. Counting objects: 31, done. Compressing objects: 100% (14/14), done. Writing objects: 100% (21/21), 2.02 KiB, done. Total 21 (delta 8), reused 0 (delta 0) To git://XXXX/YY = [up to date] TEST -> TEST ! [remote rejected] master -> master (hook declined) ! [remote rejected] v3.11 -> v3.11 (hook declined) error: failed to push some refs to 'git://XXXX/YY'
I also get a warning when moving between branches: $ git checkout v3.11 Switched to branch "v3.11" Your branch is ahead of the tracked remote branch 'origin/v3.11' by 1 commit.
$ git checkout master Switched to branch "master" Your branch is ahead of the tracked remote branch 'origin/master' by 2 commits.
Any ideas how to recover from here? The git-daemon seems to run fine, as I can commit and push from another test project. It would be nice if there were more clean failure messages from the daemon...(Enhancement)
Thanks, Alf