From: "Alf Clement" <alf.clement@gmail.com>
To: git@vger.kernel.org
Subject: problem with branches
Date: Mon, 2 Jun 2008 12:14:07 +0200 [thread overview]
Message-ID: <556d90580806020314u7ba60af7kc0176a1867ba32fb@mail.gmail.com> (raw)
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
next reply other threads:[~2008-06-02 10:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-02 10:14 Alf Clement [this message]
2008-06-02 17:23 ` problem with branches Jeff King
-- strict thread matches above, loose matches on Subject: below --
2008-06-02 13:59 Alf Clement
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=556d90580806020314u7ba60af7kc0176a1867ba32fb@mail.gmail.com \
--to=alf.clement@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).