2.
[转]Git: push 出错的解决 master -> master (branch is currently checked out)
2012-3-13阅读924 评论0
在使用Git Push代码到数据仓库时，提示如下错误:
[remote rejected] master -> master (branch is currently checked out)
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 git
@192.168.1.X:/var/git.server/.../web
! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to 'git
@192.168.1.X:/var/git.server/.../web'
这是由于git默认拒绝了push操作，需要进行设置，修改.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 init 初始化，当客户端仓库push内容时，服务器端仓库可以看到log，但是更新的文件不能显示，必须使用git reset --hard才能更新内容
如果使用git --bare init，当客户端仓库push内容时，提示“No refs in common and none specified; doing nothing.
Perhaps you should specify a branch such as 'master'.
fatal: The remote end hung up unexpectedly”，据说缺少ssh key，要去配置，如下：（嫌麻烦未实验）
ssh -T
git@github.com个人还是采用 git init配置。
3.
@墨客，百度了，一大推，全是些一模一样的，谷歌，直接去官方了，还是没解决！