克隆代码后，修改！ 再通过命令：git push origin master 提交合并时报错：
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 [email protected]:/var/git.server/.../web
! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to '[email protected]:/var/git.server/.../web'
到底是什么原理？
updating the current branch in a non-bare repository
你的 origin repo 不是 bare 的，也就是说远程 repo 有工作区，且已经被 checkout 某个 branch，这种情况下 git 不允许你 push，因为如果你要 push 的代码跟远程代码有 conflict，在你这边是没有办法 resolve 的。
你们需要先创建一个 bare repo，然后各自从 bare repo clone，再开发，等 push 的时候是 push 到 bare repo，而不是对方进行开发的那个 repo
我们平时就两个人。 1 * Gitosis 做服务器 2 * Git 做 client 服务器端使用 git init . --bare 初始化仓库. 客户端初始化 push 项目 git remote add origin git_At_hostname:repositories/project.git git commit -a -m "****" git push origin refs/head/master
# 首先从现有repo clone出一个bare repo
64 gewang@LM-SHC-00355679@10:18:53:~/test/demo
=> git clone --bare ~/temp_project/sandbox/ bare-repo.git
Cloning into bare repository 'bare-repo.git'...
done.
65 gewang@LM-SHC-00355679@10:18:59:~/test/demo
=> cd bare-repo.git/
# 可以看到repo是bare的
66 gewang@LM-SHC-00355679@10:19:02:~/test/demo/bare-repo.git (test)
=> git config --get core.bare
true
67 gewang@LM-SHC-00355679@10:19:10:~/test/demo/bare-repo.git (test)
=> cd ..
# 模拟某个用户
68 gewang@LM-SHC-00355679@10:19:27:~/test/demo
=> mkdir UserA
69 gewang@LM-SHC-00355679@10:19:48:~/test/demo
=> cd UserA/
# 用户从bare repo clone
70 gewang@LM-SHC-00355679@10:19:50:~/test/demo/UserA
=> git clone ../bare-repo.git/ repoA
Cloning into 'repoA'...
done.
71 gewang@LM-SHC-00355679@10:20:09:~/test/demo/UserA
=> cd repoA/
72 gewang@LM-SHC-00355679@10:20:11:~/test/demo/UserA/repoA (test)
=> git config user.name userA
73 gewang@LM-SHC-00355679@10:20:21:~/test/demo/UserA/repoA (test)
=> git config user.email '[email protected]'
74 gewang@LM-SHC-00355679@10:21:58:~/test/demo/UserA/repoA (test)
=> ls
README.md file_b_dev file_b_master file_b_test
# 进行开发。。
75 gewang@LM-SHC-00355679@10:22:00:~/test/demo/UserA/repoA (test)
=> touch a b c
76 gewang@LM-SHC-00355679@10:22:04:~/test/demo/UserA/repoA (test)
=> git add .
77 gewang@LM-SHC-00355679@10:22:06:~/test/demo/UserA/repoA (test)
=> git commit -m 'userA add new file'
[test 8d6efc1] userA add new file
0 files changed
create mode 100644 a
create mode 100644 b
create mode 100644 c
# push回bare repo
78 gewang@LM-SHC-00355679@10:22:18:~/test/demo/UserA/repoA (test)
=> git push origin test:test
Counting objects: 4, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 358 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
To /Users/gewang/test/demo/UserA/../bare-repo.git/
b46828c..8d6efc1 test -> test
#9 楼 @JohnLu 我的 Gitosis 架在 ubuntu 11.10, 用户 git, 平时使用自己用户 lvjian 需要创建仓库的时候: su git 然后到 gitosis 目录 mkdir & cd & git init . --bare 我的目录是 ~/repositories (Git 用户)
lvjian 使用: git remote add git@hostname:repositories/project.git git push origin master
其他用户 clone git clone git@hostname:repositories/project.git