git push拒绝更新

来源:互联网 发布:js onload onready 编辑:程序博客网 时间:2024/05/17 20:23

转载自: http://zhiwei.li/text/2010/07/git-push%E6%8B%92%E7%BB%9D%E6%9B%B4%E6%96%B0/


$ git push

carbon@192.168.1.100′s password: 

Counting objects: 39, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (23/23), done.

Writing objects: 100% (23/23), 9.14 KiB, done.

Total 23 (delta 15), reused 0 (delta 0)

remote: error: refusing to update checked out branch: refs/heads/master

remote: error: By default, updating the current branch in a non-bare repository

remote: error: is denied, because it will make the index and work tree inconsistent

remote: error: with what you pushed, and will require ‘git reset –hard’ to match

remote: error: the work tree to HEAD.

remote: error: 

remote: error: You can set ‘receive.denyCurrentBranch’ configuration variable to

remote: error: ‘ignore’ or ‘warn’ in the remote repository to allow pushing into

remote: error: its current branch; however, this is not recommended unless you

remote: error: arranged to update its work tree to match what you pushed in some

remote: error: other way.

remote: error: 

remote: error: To squelch this message and still keep the default behaviour, set

remote: error: ‘receive.denyCurrentBranch’ configuration variable to ‘refuse’.

To 192.168.1.100:/home/zhiwei/www

 ! [remote rejected] master -> master (branch is currently checked out)

error: failed to push some refs to ’192.168.1.100:/home/zhiwei/www’

 

解决方法一:

修改.git/config添加如下代码:
[receive]
            denyCurrentBranch = ignore

在参考资料一中,还提到:

在初始化远程仓库时最好使用 git –bare init 而不要使用:git init
如果使用了git init初始化,则远程仓库的目录下,也包含work tree,当本地仓库向远程仓库push时, 如果远程仓库正在push的分支上(如果当时不在push的分支,就没有问题), 那么push后的结果不会反应在work tree上, 也即在远程仓库的目录下对应的文件还是之前的内容,必须得使用git reset –hard才能看到push后的内容.

解决方法二:

git config –bool core.bare true